Полностью поддерживает английский язык

This commit is contained in:
AidarKC
2026-11-10 14:02:34 +03:00
parent 405b9a91a7
commit 9c30b33b39
71 changed files with 2658 additions and 1445 deletions
+1 -1
View File
@@ -435,7 +435,7 @@ export function render({navigate, chrome}) {
<span style="display:block; margin-bottom:0.55rem;">
${th('screens.access_servers_view.text_023')}
</span>
${address ? `<span style="display:block; overflow-wrap:anywhere; margin-bottom:0.55rem;">Кошелёк: ${escapeHtml(address)}</span>` : ''}
${address ? `<span style="display:block; overflow-wrap:anywhere; margin-bottom:0.55rem;">${th('remaining.html_access_servers_view.wallet')}${escapeHtml(address)}</span>` : ''}
<a class="primary-btn" href="${escapeHtml(topupUrl)}" target="_blank" rel="noopener" style="display:inline-flex; text-decoration:none;">${th('screens.access_servers_view.text_024')}</a>
`;
};
+5 -5
View File
@@ -19,8 +19,8 @@ export const pageMeta = { id: 'add-channel-view', get title() { return t('screen
const CREATE_CHANNEL_FLASH_KEY = 'shine-channels-create-success';
const CHANNEL_TYPE_PUBLIC = 1;
const CHANNEL_LOGIN_HINT = 'Латиница, цифры, _ и -, от 4 до 32 символов, не только цифры.';
const CHANNEL_LOGIN_DIGITS_ONLY_HINT = 'Имя канала не должно состоять только из цифр.';
const CHANNEL_LOGIN_HINT = () => t('remaining.add_channel.channel_login_hint');
const CHANNEL_LOGIN_DIGITS_ONLY_HINT = () => t('remaining.add_channel.channel_login_digits_only_hint');
function persistCreateSuccessFlash(message) {
try {
@@ -138,7 +138,7 @@ export function render({navigate, chrome}) {
<div class="form-field">
<label for="channel-name">${th('screens.add_channel_view.text_026')}</label>
<input id="channel-name" class="input" maxlength="32" placeholder="my-channel" required autocomplete="off" autocapitalize="off" spellcheck="false" />
<div class="form-field__hint channel-create-login-hint">${CHANNEL_LOGIN_HINT} Заполняется из названия, можно поправить.</div>
<div class="form-field__hint channel-create-login-hint">${CHANNEL_LOGIN_HINT()}${th('remaining.html_add_channel_view.auto_filled_from_the_title_you_can_edit_it')}</div>
<div class="form-field__hint channel-link-preview" id="channel-link-preview" hidden></div>
<div id="channel-name-error" class="inline-error"></div>
</div>
@@ -214,7 +214,7 @@ export function render({navigate, chrome}) {
ownerBlockchainName,
channelName: normalizedChannelName,
});
linkPreviewEl.innerHTML = `Прямая ссылка: <a href="${directUrl}" target="_blank" rel="noopener noreferrer">${directUrl}</a>`;
linkPreviewEl.innerHTML = `${th('remaining.html_add_channel_view.direct_link')}<a href="${directUrl}" target="_blank" rel="noopener noreferrer">${directUrl}</a>`;
};
const refreshAvatarAvailability = async () => {
@@ -328,7 +328,7 @@ export function render({navigate, chrome}) {
const check = updateValidation();
if (check.name && /^[0-9]+$/.test(check.name)) {
nameErrorEl.textContent = CHANNEL_LOGIN_DIGITS_ONLY_HINT;
nameErrorEl.textContent = CHANNEL_LOGIN_DIGITS_ONLY_HINT();
nameEl.focus();
return;
}
+5 -4
View File
@@ -1,12 +1,13 @@
import { formatTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { createTopBar } from '../components/topbar.js';
import { clearAppLogEntries, getAppLogEntries } from '../state.js';
export const pageMeta = { id: 'app-log-view', get title() { return t('screens.app_log_view.text_001'); } };
function formatTime(ts) {
function formatLogTime(ts) {
try {
return new Date(ts).toLocaleTimeString('ru-RU');
return formatTime(new Date(ts));
} catch {
return String(ts || '');
}
@@ -43,7 +44,7 @@ export function render({navigate, chrome}) {
.map((entry) => {
const level = String(entry.level || 'info').toUpperCase();
const source = String(entry.source || 'ui');
const header = `[${formatTime(entry.ts)}] ${level} ${source}`;
const header = `[${formatLogTime(entry.ts)}] ${level} ${source}`;
const message = String(entry.message || '');
const details = String(entry.details || '').trim();
return details ? `${header}\n${message}\n${details}` : `${header}\n${message}`;
@@ -92,7 +93,7 @@ export function render({navigate, chrome}) {
const head = document.createElement('div');
head.className = 'meta-muted';
head.textContent = `[${formatTime(entry.ts)}] ${level} ${source}`;
head.textContent = `[${formatLogTime(entry.ts)}] ${level} ${source}`;
const message = document.createElement('div');
message.textContent = entry.message || '';
+4 -3
View File
@@ -1,3 +1,4 @@
import { formatDate } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { iconHtml } from '../components/ui-icon.js';
import { createTopBar } from '../components/topbar.js';
@@ -78,9 +79,9 @@ function formatChannelCreatedAt(value) {
const time = Number(value || 0);
if (!Number.isFinite(time) || time <= 0) return t('screens.channel_about_view.text_011');
try {
return new Intl.DateTimeFormat('ru-RU', { day: '2-digit', month: 'long', year: 'numeric' }).format(new Date(time));
return formatDate(new Date(time), { day: '2-digit', month: 'long', year: 'numeric' });
} catch {
return new Date(time).toLocaleDateString('ru-RU');
return formatDate(new Date(time));
}
}
@@ -619,7 +620,7 @@ export function render({ navigate, route, chrome }) {
<span class="channel-about-owner-avatar" id="channel-about-owner-avatar"></span>
<span class="channel-about-row-main">
<strong>${escapeHtml(ownerName)}</strong>
<span class="channel-about-row-label">Владелец · ${escapeHtml(ownerLogin)}</span>
<span class="channel-about-row-label">${th('remaining.html_channel_about_view.owner')}${escapeHtml(ownerLogin)}</span>
</span>
<span class="channel-about-row-chevron">${iconHtml('chevron')}</span>
</button>
+5 -4
View File
@@ -1,3 +1,4 @@
import { formatDateTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { appendShineMessageLinks } from '../services/shine-message-links.js';
import { confirmDialog } from '../components/confirm-dialog.js';
@@ -477,7 +478,7 @@ function openBlockchainDetailsModal(details, { isActive = () => true } = {}) {
<span>${t('dialogs.modals.channel_thread_view.label_005')}</span><code>${escapeHtml(details.blockNumber)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_006')}</span><code>${escapeHtml(details.blockHash)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_007')}</span><code>${escapeHtml(details.msgSubType)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_008')}</span><code>${escapeHtml(details.createdAtMs ? new Date(Number(details.createdAtMs)).toLocaleString('ru-RU') : '–')}</code>
<span>${t('dialogs.modals.channel_thread_view.label_008')}</span><code>${escapeHtml(details.createdAtMs ? formatDateTime(new Date(Number(details.createdAtMs))) : '–')}</code>
<span>Public key</span><code>${escapeHtml(details.publicKey)}</code>
<span>${t('dialogs.modals.channel_thread_view.label_009')}</span><code>${escapeHtml(details.signature)}</code>
</div>
@@ -634,7 +635,7 @@ function openMessageHistoryModal({ versions = [], title = t('dialogs.remaining.p
const text = String(item?.text || '').trim() || t('dialogs.remaining.pages.channel_thread_view.openmessagehistorymodal.udaleno');
row.innerHTML = `
<strong>${t('dialogs.final.history.version', { version: index + 1 })}</strong>
<div class="meta-muted">${ts > 0 ? new Date(ts).toLocaleString('ru-RU') : '–'}</div>
<div class="meta-muted">${ts > 0 ? formatDateTime(new Date(ts)) : '–'}</div>
<p class="channel-message-body">${text}</p>
`;
list.append(row);
@@ -730,7 +731,7 @@ function renderNodeCard(node, heading, handlers, localNumber, { focusPost = fals
const timestamp = document.createElement('div');
timestamp.className = 'channel-message-time';
timestamp.textContent = node?.createdAtMs ? formatRelativeTime(node.createdAtMs) : '–';
if (node?.createdAtMs) timestamp.title = new Date(node.createdAtMs).toLocaleString('ru-RU');
if (node?.createdAtMs) timestamp.title = formatDateTime(new Date(node.createdAtMs));
authorBlock.append(title, timestamp);
authorTile.append(avatar, authorBlock);
// Запись канала в обсуждении – как открытый пост в Threads: аватар и название канала в шапке, текст на всю ширину.
@@ -1143,7 +1144,7 @@ function renderComment({ node, parent, focus, channelOwner, handlers, nested = f
}
const time = document.createElement('time');
time.textContent = formatShortAge(node?.createdAtMs);
if (node?.createdAtMs) time.title = new Date(node.createdAtMs).toLocaleString('ru-RU');
if (node?.createdAtMs) time.title = formatDateTime(new Date(node.createdAtMs));
head.append(time);
main.append(head);
+15 -11
View File
@@ -1,3 +1,4 @@
import { formatDateTime, getIntlLocale } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { appendShineMessageLinks } from '../services/shine-message-links.js';
import { confirmDialog } from '../components/confirm-dialog.js';
@@ -80,7 +81,7 @@ const MSG_SUBTYPE_STATUS_IN_STUDY = 130;
const MSG_SUBTYPE_STATUS_ABANDONED = 140;
const MSG_SUBTYPE_STATUS_COMPLETED = 150;
const DIARY_CHANNEL_NAME = 'diary';
const DIARY_CHANNEL_DISPLAY_NAME = 'Дневник';
const DIARY_CHANNEL_DISPLAY_NAME = () => t('remaining.channel.diary_channel_display_name');
const pendingReactionActions = new Set();
const pendingScrollByRoute = new Map();
@@ -661,15 +662,16 @@ function openChannelMetaDetailsModal({
canEdit = false,
onEdit = null,
changedAtMs = 0,
dateKind = 'updated',
} = {}) {
const changedAtLabel = changedAtMs
? new Date(Number(changedAtMs)).toLocaleString('ru-RU')
? formatDateTime(new Date(Number(changedAtMs)))
: '–';
const channelTitle = String(channel.displayTitle || channel.displayName || channel.name || '–').trim();
const ownerLogin = String(channel.ownerLogin || channel.ownerName || extractLoginFromBlockchainName(channel.ownerBlockchainName) || '').trim();
const channelSlug = String(channel.name || '').trim();
const systemName = formatChannelAddress({ ownerLogin, channelName: channelSlug }) || '–';
const dateLabel = title === t('dialogs.final.channel.created') ? t('dialogs.remaining.pages.channel_view.openchannelmetadetailsmodal.data_sozdaniya') : t('dialogs.remaining.pages.channel_view.openchannelmetadetailsmodal.data_izmeneniya');
const dateLabel = dateKind === 'created' ? t('dialogs.remaining.pages.channel_view.openchannelmetadetailsmodal.data_sozdaniya') : t('dialogs.remaining.pages.channel_view.openchannelmetadetailsmodal.data_izmeneniya');
const root = document.getElementById('modal-root');
root.innerHTML = `
<div class="modal" id="about-channel-modal">
@@ -864,7 +866,7 @@ function openBlockchainDetailsModal(details, { isActive = () => true } = {}) {
<span>${t('dialogs.modals.channel_view.label_015')}</span><code>${escapeHtml(details.blockNumber)}</code>
<span>${t('dialogs.modals.channel_view.label_016')}</span><code>${escapeHtml(details.blockHash)}</code>
<span>${t('dialogs.modals.channel_view.label_017')}</span><code>${escapeHtml(details.msgSubType)}</code>
<span>${t('dialogs.modals.channel_view.label_018')}</span><code>${escapeHtml(details.createdAtMs ? new Date(Number(details.createdAtMs)).toLocaleString('ru-RU') : '–')}</code>
<span>${t('dialogs.modals.channel_view.label_018')}</span><code>${escapeHtml(details.createdAtMs ? formatDateTime(new Date(Number(details.createdAtMs))) : '–')}</code>
<span>Public key</span><code>${escapeHtml(details.publicKey)}</code>
<span>${t('dialogs.modals.channel_view.label_019')}</span><code>${escapeHtml(details.signature)}</code>
</div>
@@ -1102,7 +1104,7 @@ function openEntrypointHistoryModal({ channelTitle = '', posts = [], onSelect })
item.type = 'button';
item.className = 'ui-button entrypoint-history-item';
item.innerHTML = `
<strong>${escapeHtml(post.timestampMs ? new Date(post.timestampMs).toLocaleString('ru-RU') : t('dialogs.remaining.pages.channel_view.openentrypointhistorymodal.bez_daty'))}</strong>
<strong>${escapeHtml(post.timestampMs ? formatDateTime(new Date(post.timestampMs)) : t('dialogs.remaining.pages.channel_view.openentrypointhistorymodal.bez_daty'))}</strong>
<span>#${escapeHtml(post.localNumber || '–')}</span>
<p>${escapeHtml(String(parsed.text || '').trim() || t('dialogs.remaining.pages.channel_view.openentrypointhistorymodal.bez_teksta'))}</p>
`;
@@ -1373,7 +1375,7 @@ async function loadFromApi(route, channelId) {
return {
channel: {
name: diaryPayload?.channel?.channelName || DIARY_CHANNEL_NAME,
displayTitle: String(diaryPayload?.channel?.displayName || DIARY_CHANNEL_DISPLAY_NAME).trim(),
displayTitle: String(diaryPayload?.channel?.displayName || DIARY_CHANNEL_DISPLAY_NAME()).trim(),
displayName: t('screens.channel_view.text_093'),
description: String(diaryPayload?.channel?.channelDescription || '').trim(),
avaAr: '',
@@ -1673,13 +1675,14 @@ function renderChannelMetaEventCard(event, dayLabel = '') {
: event.kind === 'deleted'
? t('screens.channel_view.text_094')
: t('screens.channel_view.text_095');
const shownLabel = dayLabel ? `${label} · ${dayLabel.toLocaleLowerCase('ru-RU')}` : label;
const shownLabel = dayLabel ? `${label} · ${dayLabel.toLocaleLowerCase(getIntlLocale())}` : label;
card.innerHTML = `
<span class="channel-system-event-card__label">${escapeHtml(shownLabel)}</span>
`;
if (event.kind !== 'deleted') card.addEventListener('click', () => {
openChannelMetaDetailsModal({
title: label,
dateKind: event.kind === 'created' ? 'created' : 'updated',
channel: {
name: event.name,
ownerLogin: event.ownerLogin,
@@ -1858,7 +1861,7 @@ function renderPostCard(post, {
const timestamp = document.createElement('div');
timestamp.className = 'channel-message-time';
timestamp.textContent = post.timestampMs ? formatRelativeTime(post.timestampMs) : '–';
if (post.timestampMs) timestamp.title = new Date(post.timestampMs).toLocaleString('ru-RU');
if (post.timestampMs) timestamp.title = formatDateTime(new Date(post.timestampMs));
if (versionsTotal > 1) {
const editedMarker = document.createElement('span');
editedMarker.type = 'button';
@@ -2597,7 +2600,7 @@ export function render({ navigate, route, chrome }) {
const aboutRoute = makeShineChannelAboutRoute(routeArgs);
const donateRoute = makeShineChannelDonateRoute(routeArgs);
const items = [];
items.push({ label: apiData?.isOwnChannel ? t('screens.channel_view.text_106') : t('screens.channel_view.text_107'), iconHtml: iconHtml(apiData?.isOwnChannel ? 'edit' : 'info'), action: () => { if (aboutRoute) navigate(aboutRoute); } });
items.push({ id: 'channel-about', label: apiData?.isOwnChannel ? t('screens.channel_view.text_106') : t('screens.channel_view.text_107'), iconHtml: iconHtml(apiData?.isOwnChannel ? 'edit' : 'info'), action: () => { if (aboutRoute) navigate(aboutRoute); } });
if (apiData?.isOwnChannel && !apiData?.isDiary) {
items.push({ label: t('screens.channel_view.text_041'), iconHtml: iconHtml('compose'), action: () => activeAddMessage?.() });
}
@@ -2626,8 +2629,9 @@ export function render({ navigate, route, chrome }) {
});
}
}
const aboutIndex = items.findIndex((item) => item.label === 'О канале' || item.label === 'Редактировать');
if (aboutIndex > 0) items.unshift(...items.splice(aboutIndex, 2));
// Используем стабильный id, а не надпись, которая зависит от языка.
const aboutIndex = items.findIndex((item) => item.id === 'channel-about');
if (aboutIndex > 0) items.unshift(...items.splice(aboutIndex, 1));
return items;
},
},
+3 -3
View File
@@ -31,7 +31,7 @@ const CREATE_CHANNEL_FLASH_KEY = 'shine-channels-create-success';
const CHANNEL_TYPE_STORIES = 0;
const CHANNEL_TYPE_PERSONAL = 100;
const DIARY_CHANNEL_NAME = 'diary';
const DIARY_DISPLAY_NAME = 'Дневник';
const DIARY_DISPLAY_NAME = () => t('remaining.channels.diary_display_name');
const CHANNELS_VIEW_ALL = 'all';
const CHANNELS_VIEW_OWNED = 'owned';
@@ -676,10 +676,10 @@ function buildDiaryChannelRow(diaryPayload, ownRows = [], notificationsState = {
channelRootBlockHash: '0',
avatar: t('screens.channels_list.text_012'),
avaAr: '',
title: DIARY_DISPLAY_NAME,
title: DIARY_DISPLAY_NAME(),
technicalLabel: t('screens.channels_list.text_013'),
channelName: DIARY_CHANNEL_NAME,
displayTitle: DIARY_DISPLAY_NAME,
displayTitle: DIARY_DISPLAY_NAME(),
channelDescription: t('screens.channels_list.text_014'),
channelTypeCode: 900,
channelTypeVersion: 1,
+7 -4
View File
@@ -1,3 +1,4 @@
import { formatDate } from '../i18n/format.js';
import { t } from '../i18n/index.js';
// «Медиа и файлы» личной переписки: сетка фото и видео и список документов по месяцам.
// История догружается с сервера целиком; превью расшифровываются, только когда плитка видна.
@@ -14,7 +15,7 @@ import { navigateUp } from '../router.js';
export const pageMeta = { id: 'chat-media-view', get title() { return t('screens.chat_media_view.text_001'); } };
const monthTitle = new Intl.DateTimeFormat('ru-RU', { month: 'long', year: 'numeric' });
const monthTitle = (date) => formatDate(date, { month: 'long', year: 'numeric' });
// Все вложения переписки, от новых к старым.
function collectAttachments(chatId) {
@@ -37,11 +38,13 @@ function collectAttachments(chatId) {
function groupByMonth(entries) {
const groups = [];
for (const entry of entries) {
const raw = entry.timeMs ? monthTitle.format(new Date(entry.timeMs)) : t('screens.chat_media_view.text_003');
const date = entry.timeMs ? new Date(entry.timeMs) : null;
const key = date ? `${date.getFullYear()}-${date.getMonth()}` : 'unknown';
const raw = date ? monthTitle(date) : t('screens.chat_media_view.text_003');
const label = raw.charAt(0).toUpperCase() + raw.slice(1);
const last = groups[groups.length - 1];
if (last?.label === label) last.items.push(entry);
else groups.push({ label, items: [entry] });
if (last?.key === key) last.items.push(entry);
else groups.push({ key, label, items: [entry] });
}
return groups;
}
+5 -4
View File
@@ -1,3 +1,4 @@
import { formatDate, formatDateTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { appendShineMessageLinks } from '../services/shine-message-links.js';
import { iconHtml } from '../components/ui-icon.js';
@@ -294,7 +295,7 @@ function capitalize(text) {
function openDateJumpModal({ days = new Map(), loading = false, onPick } = {}) {
const root = document.getElementById('modal-root');
if (!root) return null;
const monthTitle = new Intl.DateTimeFormat('ru-RU', { month: 'long', year: 'numeric' });
const monthTitle = (date) => formatDate(date, { month: 'long', year: 'numeric' });
const weekdays = [t('dialogs.remaining.pages.chat_view.opendatejumpmodal.pn'), t('dialogs.remaining.pages.chat_view.opendatejumpmodal.vt'), t('dialogs.remaining.pages.chat_view.opendatejumpmodal.sr'), t('dialogs.remaining.pages.chat_view.opendatejumpmodal.cht'), t('dialogs.remaining.pages.chat_view.opendatejumpmodal.pt'), t('dialogs.remaining.pages.chat_view.opendatejumpmodal.sb'), t('dialogs.remaining.pages.chat_view.opendatejumpmodal.vs')];
let currentDays = days;
let isLoading = loading;
@@ -326,7 +327,7 @@ function openDateJumpModal({ days = new Map(), loading = false, onPick } = {}) {
const monthIndex = (t) => { const d = new Date(t); return d.getFullYear() * 12 + d.getMonth(); };
const renderMonth = () => {
titleEl.textContent = capitalize(monthTitle.format(new Date(viewYear, viewMonth, 1)));
titleEl.textContent = capitalize(monthTitle(new Date(viewYear, viewMonth, 1)));
const current = viewYear * 12 + viewMonth;
prevBtn.disabled = current <= monthIndex(earliestTime());
nextBtn.disabled = current >= monthIndex(Date.now());
@@ -839,13 +840,13 @@ function openConfirmContactModal(targetLogin = '') {
function formatMessageTime(valueMs) {
const timeMs = Number(valueMs || 0);
if (!Number.isFinite(timeMs) || timeMs <= 0) return '';
return new Intl.DateTimeFormat('ru-RU', {
return formatDateTime(new Date(timeMs), {
day: '2-digit',
month: '2-digit',
year: '2-digit',
hour: '2-digit',
minute: '2-digit',
}).format(new Date(timeMs));
});
}
function formatCallDurationCompact(totalSeconds) {
+1 -1
View File
@@ -66,7 +66,7 @@ function requestCardHtml(request) {
<div style="font-size:28px; font-weight:700; letter-spacing:0.14em;">${shortCode}</div>
<span class="meta-muted">Session name: ${client}</span>
<span class="meta-muted">Session kind: ${sessionKind}</span>
<span class="meta-muted">Истекает: ${expiresText}</span>
<span class="meta-muted">${th('remaining.html_device_pairing_view.expires')}${expiresText}</span>
</div>
</div>
<div class="row pairing-request-actions" style="flex-wrap:wrap;">
+2 -1
View File
@@ -1,3 +1,4 @@
import { formatDateTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { createTopBar } from '../components/topbar.js';
import { confirmDialog } from '../components/confirm-dialog.js';
@@ -22,7 +23,7 @@ function formatSessionType(sessionType) {
}
function formatSessionTime(ms) {
return new Date(ms).toLocaleString('ru-RU', {
return formatDateTime(new Date(ms), {
day: '2-digit',
month: '2-digit',
year: 'numeric',
+3 -2
View File
@@ -1,3 +1,4 @@
import { formatDate, formatTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { showToast } from '../services/channels-ux.js';
import { createTopBar } from '../components/topbar.js';
@@ -46,13 +47,13 @@ function describeClient(userAgent) {
// «сегодня, 02:20» / «вчера, 23:10» / «24 сентября, 18:05».
function formatSessionTime(ms) {
const date = new Date(ms);
const time = date.toLocaleTimeString('ru-RU', { hour: '2-digit', minute: '2-digit' });
const time = formatTime(date, { hour: '2-digit', minute: '2-digit' });
const startOf = (d) => new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
const days = Math.round((startOf(new Date()) - startOf(date)) / 86400000);
if (days === 0) return t('screens.device_view.text_028', { value1: time });
if (days === 1) return t('screens.device_view.text_029', { value1: time });
const sameYear = date.getFullYear() === new Date().getFullYear();
const day = date.toLocaleDateString('ru-RU', { day: 'numeric', month: 'long', ...(sameYear ? {} : { year: 'numeric' }) });
const day = formatDate(date, { day: 'numeric', month: 'long', ...(sameYear ? {} : { year: 'numeric' }) });
return `${day}, ${time}`;
}
+4 -3
View File
@@ -1,3 +1,4 @@
import { formatDateTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { createTopBar } from '../components/topbar.js';
import { confirmPasswordBoundarySpaces } from '../services/password-boundary-warning.js';
@@ -37,7 +38,7 @@ export function render({navigate,chrome}){
}
function setRoot(...nodes){root.replaceChildren(...nodes);}
function exitAfterComplete(){updateTopbar('COMPLETE');navigate('access-keys-view');}
function statusCard(s){const card=document.createElement('div');card.className='card stack';card.innerHTML=`<strong>${h(stageText(s.rotationStatus))}</strong><span class="meta-muted">${h(s.sourceBlockchainName||'')} → ${h(s.candidateBlockchainName||'')}</span><span class="meta-muted">Прогресс: ${Number(s.progressCurrent||0)} / ${Number(s.progressTotal||0)}</span>${s.lastError?`<span>${h(s.lastError)}</span>`:''}`;return card;}
function statusCard(s){const card=document.createElement('div');card.className='card stack';card.innerHTML=`<strong>${h(stageText(s.rotationStatus))}</strong><span class="meta-muted">${h(s.sourceBlockchainName||'')} → ${h(s.candidateBlockchainName||'')}</span><span class="meta-muted">${th('remaining.html_key_rotation_view.progress')}${Number(s.progressCurrent||0)} / ${Number(s.progressTotal||0)}</span>${s.lastError?`<span>${h(s.lastError)}</span>`:''}`;return card;}
function note(text){const c=document.createElement('div');c.className='card';c.textContent=text;return c;}
async function renderNone(){
@@ -48,7 +49,7 @@ export function render({navigate,chrome}){
const comment=document.createElement('textarea');comment.className='text-input';comment.rows=3;comment.maxLength=1024;comment.placeholder=t('screens.key_rotation_view.text_004');
const list=document.createElement('div');list.className='stack';const more=document.createElement('button');more.className='secondary-btn';more.type='button';more.textContent=t('screens.key_rotation_view.text_005');
let selected=null,before=null,loading=false;
async function load(){if(loading)return;loading=true;more.disabled=true;try{const d=await client.getMyBlockchain({beforeBlock:before,limit:100});for(const b of d.blocks||[]){const btn=document.createElement('button');btn.type='button';btn.className='nav-row';btn.innerHTML=`<span class="nav-row__label">#${b.blockNumber} · ${new Date(Number(b.timestampMs)||0).toLocaleString('ru-RU')}</span><span class="nav-row__hint">${short(b.blockHash)}</span>`;btn.addEventListener('click',()=>{selected=b;list.querySelectorAll('button').forEach(x=>x.setAttribute('aria-pressed','false'));btn.setAttribute('aria-pressed','true');});if(selected==null && b.blockNumber===d.tipBlockNumber){selected=b;btn.setAttribute('aria-pressed','true');}list.append(btn);}before=d.nextBeforeBlock;more.hidden=before==null;}finally{loading=false;more.disabled=false;}}
async function load(){if(loading)return;loading=true;more.disabled=true;try{const d=await client.getMyBlockchain({beforeBlock:before,limit:100});for(const b of d.blocks||[]){const btn=document.createElement('button');btn.type='button';btn.className='nav-row';btn.innerHTML=`<span class="nav-row__label">#${b.blockNumber} · ${formatDateTime(new Date(Number(b.timestampMs)||0))}</span><span class="nav-row__hint">${short(b.blockHash)}</span>`;btn.addEventListener('click',()=>{selected=b;list.querySelectorAll('button').forEach(x=>x.setAttribute('aria-pressed','false'));btn.setAttribute('aria-pressed','true');});if(selected==null && b.blockNumber===d.tipBlockNumber){selected=b;btn.setAttribute('aria-pressed','true');}list.append(btn);}before=d.nextBeforeBlock;more.hidden=before==null;}finally{loading=false;more.disabled=false;}}
more.addEventListener('click',()=>void load());
const start=document.createElement('button');start.className='primary-btn';start.type='button';start.textContent=t('screens.key_rotation_view.text_006');
const error=document.createElement('div');error.className='meta-muted';
@@ -124,7 +125,7 @@ export function render({navigate,chrome}){
const result=await transferAllSol({endpoint:solanaEndpoint,fromKeypair:oldWallet.keypair,toAddress:newWallet.address});
details.insertAdjacentHTML('beforeend',`<span class="meta-muted">${result.skipped?t('screens.key_rotation_view.text_049'):t('screens.key_rotation_view.text_067', { value1: h(formatSol(Number(result.lamports)/1_000_000_000,9)), value2: h(result.signature) })}</span>`);
}else{
details.insertAdjacentHTML('beforeend','<span class="meta-muted">На старом кошельке нет SOL для переноса.</span>');
details.insertAdjacentHTML('beforeend','<span class="meta-muted">${th('remaining.html_key_rotation_view.the_old_wallet_has_no_sol_to_transfer')}</span>');
}
transferFinished=true;
updateActions();
+17 -16
View File
@@ -134,14 +134,14 @@ function clipPreviewText(text, maxLen = PREVIEW_MAX_LEN) {
return `${normalized.slice(0, maxLen - 1)}…`;
}
const DM_PREVIEW_ENCRYPTED = 'Зашифрованное сообщение';
const DM_PREVIEW_EMPTY = 'Нет сообщений';
const DM_PREVIEW_ENCRYPTED = () => t('remaining.messages.dm_preview_encrypted');
const DM_PREVIEW_EMPTY = () => t('remaining.messages.dm_preview_empty');
async function resolveDialogPreview(dialog) {
const localText = clipPreviewText(String(dialog?.lastMessageText || '').trim());
if (localText) return localText;
if (localText) return { text: localText, kind: 'message' };
const blobB64 = String(dialog?.lastMessageBlobB64 || '').trim();
if (!blobB64) return DM_PREVIEW_EMPTY;
if (!blobB64) return { text: DM_PREVIEW_EMPTY(), kind: 'empty' };
const cacheKey = [
blobB64,
@@ -151,7 +151,7 @@ async function resolveDialogPreview(dialog) {
// После перезагрузки пароля хранилища в памяти нет — расшифровать нечем. Не кэшируем,
// чтобы превью появилось, когда пароль снова будет введён.
if (!String(state.session.storagePwdInMemory || '').trim()) return DM_PREVIEW_ENCRYPTED;
if (!String(state.session.storagePwdInMemory || '').trim()) return { text: DM_PREVIEW_ENCRYPTED(), kind: 'encrypted' };
if (DM_BLOB_PREVIEW_CACHE.has(cacheKey)) return DM_BLOB_PREVIEW_CACHE.get(cacheKey);
if (DM_BLOB_PREVIEW_PENDING.has(cacheKey)) return DM_BLOB_PREVIEW_PENDING.get(cacheKey);
@@ -167,10 +167,11 @@ async function resolveDialogPreview(dialog) {
const parsedText = parseDmTechBlocks(String(decrypted?.text || ''));
const display = clipPreviewText(String(parsedText.displayText || '').trim());
const result = display || t('screens.messages_list.text_033');
DM_BLOB_PREVIEW_CACHE.set(cacheKey, result);
return result;
const preview = { text: result, kind: 'message' };
DM_BLOB_PREVIEW_CACHE.set(cacheKey, preview);
return preview;
} catch {
const fallback = DM_PREVIEW_ENCRYPTED;
const fallback = { text: DM_PREVIEW_ENCRYPTED(), kind: 'encrypted' };
DM_BLOB_PREVIEW_CACHE.set(cacheKey, fallback);
return fallback;
} finally {
@@ -418,18 +419,18 @@ function renderRow(item) {
row.prepend(avatarWrap);
// Текст превью ставится сразу, если известен; иначе строка пустая до расшифровки –
// без мелькающего «Загрузка…».
const showPreview = (text) => {
const showPreview = (text, kind = 'message') => {
if (!previewEl) return;
previewEl.textContent = String(text || '').trim() || DM_PREVIEW_EMPTY;
previewEl.classList.toggle('is-encrypted', text === DM_PREVIEW_ENCRYPTED);
previewEl.classList.toggle('is-empty', previewEl.textContent === DM_PREVIEW_EMPTY);
previewEl.textContent = String(text || '').trim() || DM_PREVIEW_EMPTY();
previewEl.classList.toggle('is-encrypted', kind === 'encrypted');
previewEl.classList.toggle('is-empty', kind === 'empty' || !String(text || '').trim());
};
const knownText = clipPreviewText(String(item.lastMessageText || '').trim());
if (knownText || !item.lastMessageBlobB64) showPreview(knownText);
if (knownText || !item.lastMessageBlobB64) showPreview(knownText, knownText ? 'message' : 'empty');
else {
if (previewEl) previewEl.textContent = '\u00a0';
void resolveDialogPreview(item).then((text) => {
if (previewEl?.isConnected) showPreview(text);
void resolveDialogPreview(item).then((preview) => {
if (previewEl?.isConnected) showPreview(preview.text, preview.kind);
});
}
if (item.pinned) row.classList.add('is-pinned');
@@ -545,7 +546,7 @@ function renderRow(item) {
const more = document.createElement('button');
more.type = 'button';
more.className = 'list-more';
more.innerHTML = `${iconHtml('chevron-down')}<span>Показать всех · ${silent.length}</span>`;
more.innerHTML = `${iconHtml('chevron-down')}<span>${th('remaining.html_messages_list.show_all')}${silent.length}</span>`;
more.addEventListener('click', () => { startExpanded = true; renderList(); });
frag.append(more);
}
+4 -3
View File
@@ -1,4 +1,5 @@
import { t } from '../i18n/index.js';
import { formatDateTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { createTopBar } from '../components/topbar.js';
import { authService } from '../state.js';
import { KeyRotationClient } from '../services/key-rotation-service.js';
@@ -75,7 +76,7 @@ function shortHash(value) {
function formatDate(ms) {
try {
return new Date(Number(ms) || 0).toLocaleString('ru-RU');
return formatDateTime(new Date(Number(ms) || 0));
} catch {
return '';
}
@@ -568,7 +569,7 @@ export function render({ navigate, chrome }, { historyOnly = false } = {}) {
if (reset) {
const head = document.createElement('div');
head.className = 'card stack';
head.innerHTML = `<strong>${escapeHtml(data.blockchainName || '—')}</strong><span class="meta-muted">Последний блок: #${Number(data.tipBlockNumber ?? -1)} · ${shortHash(data.tipBlockHash)}</span>`;
head.innerHTML = `<strong>${escapeHtml(data.blockchainName || '—')}</strong><span class="meta-muted">${th('remaining.html_my_blockchain_view.last_block')}${Number(data.tipBlockNumber ?? -1)} · ${shortHash(data.tipBlockHash)}</span>`;
list.append(head);
}
+1 -1
View File
@@ -330,7 +330,7 @@ export function render({ navigate, chrome }) {
genderRow.className = 'nav-row profile-param-item';
genderRow.dataset.editGender = 'true';
const genderText = genderLabel(currentGender);
const genderEmpty = genderText === 'Не указан';
const genderEmpty = currentGender !== PROFILE_GENDER_MALE && currentGender !== PROFILE_GENDER_FEMALE;
genderRow.innerHTML = `<span class="nav-row__hint">${th('screens.profile_edit_view.text_031')}</span><span class="nav-row__label${genderEmpty ? ' is-empty' : ''}" data-gender-value>${escapeHtml(genderEmpty ? t('screens.profile_edit_view.text_016') : genderText)}</span>`;
listWrap.append(genderRow);
}
@@ -1,3 +1,4 @@
import { formatNumber } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { getSolanaCluster } from '../services/solana-rpc-gateway.js';
import { createTopBar } from '../components/topbar.js';
@@ -81,7 +82,7 @@ function formatSupportTicketLabel(queueId, index) {
function formatUsdCentsText(cents) {
const value = Number(cents || 0n) / 100;
return value.toLocaleString('ru-RU', { minimumFractionDigits: 0, maximumFractionDigits: 2 });
return formatNumber(value, { minimumFractionDigits: 0, maximumFractionDigits: 2 });
}
function parsePaymentsCoef(data) {
@@ -345,7 +346,7 @@ export function render({navigate, chrome}) {
const ticketInfo = await core.connection.getAccountInfo(ticketPda, 'confirmed');
if (!ticketInfo) {
result.innerHTML = `
<p class="meta-muted" style="margin:0;">Билет ${formatSupportTicketLabel(parsed.queueId, parsed.index)} пока не создан.</p>
<p class="meta-muted" style="margin:0;">${th('remaining.html_public_support_queue_view.ticket')}${formatSupportTicketLabel(parsed.queueId, parsed.index)}${th('remaining.html_public_support_queue_view.has_not_been_created_yet')}</p>
`;
status.textContent = t('screens.public_support_queue_view.text_021', { value1: formatSupportTicketLabel(parsed.queueId, parsed.index) });
return;
@@ -368,12 +369,12 @@ export function render({navigate, chrome}) {
<div><b>${th('screens.public_support_queue_view.text_036')}</b> ${formatSupportTicketLabel(parsed.queueId, ticket.index)}</div>
<div><b>${th('screens.public_support_queue_view.text_037')}</b> ${ticket.isPaid ? t('screens.public_support_queue_view.text_013') : t('screens.public_support_queue_view.text_014')}</div>
<div><b>${th('screens.public_support_queue_view.text_038')}</b> <span style="word-break:break-all;">${ticket.recipientWallet}</span></div>
<div><b>${th('screens.public_support_queue_view.text_039')}</b> ${ticketsBefore.toString()} билетов</div>
<div><b>${th('screens.public_support_queue_view.text_040')}</b> ${paidBefore.toString()} билетов</div>
<div><b>${th('screens.public_support_queue_view.text_041')}</b> ${remainingBefore.toString()} билетов</div>
<div><b>${th('screens.public_support_queue_view.text_039')}</b> ${ticketsBefore.toString()}${th('remaining.html_public_support_queue_view.tickets_div')}
<div><b>${th('screens.public_support_queue_view.text_040')}</b> ${paidBefore.toString()}${th('remaining.html_public_support_queue_view.tickets_div')}
<div><b>${th('screens.public_support_queue_view.text_041')}</b> ${remainingBefore.toString()}${th('remaining.html_public_support_queue_view.tickets_div')}
<div><b>${th('screens.public_support_queue_view.text_042')}</b> ${formatUsdCentsText(queueState.sumPaidUsdCents)} USD</div>
<div><b>${th('screens.public_support_queue_view.text_043')}</b> ${formatUsdCentsText(ticket.payoutUsdCents)} USD</div>
<div><b>${th('screens.public_support_queue_view.text_044')}</b> ${formatUsdCentsText(ticket.debtBeforeUsdCents)} USD в очереди до него</div>
<div><b>${th('screens.public_support_queue_view.text_044')}</b> ${formatUsdCentsText(ticket.debtBeforeUsdCents)}${th('remaining.html_public_support_queue_view.usd_ahead_of_it_in_the_queue_div')}
`;
}
status.textContent = t('screens.public_support_queue_view.text_022', { value1: formatSupportTicketLabel(ticket.queueId, ticket.index), value2: endpoint });
+78 -52
View File
@@ -1,3 +1,4 @@
import { formatDateTime, formatTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { createTopBar } from '../components/topbar.js';
import { authService, state } from '../state.js';
@@ -26,7 +27,7 @@ function formatTs(ts) {
const num = Number(ts);
if (!Number.isFinite(num) || num <= 0) return '–';
try {
return new Date(num).toLocaleString('ru-RU');
return formatDateTime(new Date(num));
} catch {
return String(num);
}
@@ -41,7 +42,7 @@ function detectLaunchMode() {
return 'fullscreen';
}
if (window.matchMedia?.('(display-mode: browser)')?.matches) {
return t('screens.pwa_diagnostics_view.text_022');
return 'browser';
}
return 'unknown';
} catch {
@@ -57,37 +58,39 @@ function detectIosSafari() {
}
function buildInstallState({ launchMode, manifestOk, swRegistered }) {
if (launchMode === 'standalone' || launchMode === 'fullscreen') return t('screens.pwa_diagnostics_view.text_023');
if (canInstallPwa()) return t('screens.pwa_diagnostics_view.text_024');
if (!window.isSecureContext || !manifestOk || !swRegistered) return t('screens.pwa_diagnostics_view.text_025');
return t('screens.pwa_diagnostics_view.text_026');
if (launchMode === 'standalone' || launchMode === 'fullscreen') return 'installed';
if (canInstallPwa()) return 'prompt';
if (!window.isSecureContext || !manifestOk || !swRegistered) return 'unavailable';
return 'unknown';
}
function toneFor(value, type = 'binary') {
const v = String(value || '').toLowerCase();
if (type === 'permission') {
if (v === 'granted') return 'ok';
if (v === 'default') return 'warn';
if (v === 'denied') return 'bad';
return 'neutral';
}
if (type === 'testPush') {
if (v === 'доставлен') return 'ok';
if (v === 'отправлен') return 'warn';
if (v === 'ошибка') return 'bad';
return 'neutral';
}
if (type === 'install') {
if (v === 'уже установлено' || v === 'доступна кнопка установки') return 'ok';
if (v === 'браузер не сообщает' || v === 'недоступно') return 'warn';
return 'neutral';
}
if (type === 'launchMode') {
if (v === 'standalone' || v === 'fullscreen' || v === 'браузер') return 'ok';
return 'neutral';
}
if (v === 'да' || v === 'найден' || v === 'зарегистрирован' || v === 'поддерживается' || v === 'есть') return 'ok';
if (v === 'не найден' || v === 'не зарегистрирован' || v === 'нет' || v === 'ошибка') return 'bad';
function installStateText(code) {
const keys = { installed: 'text_023', prompt: 'text_024', unavailable: 'text_025', unknown: 'text_026' };
return t(`screens.pwa_diagnostics_view.${keys[code] || 'text_026'}`);
}
// Разрешения браузера и статусы диагностики — коды, а не переводимые подписи.
// Старые сохранённые значения push (русские слова) читаем ради совместимости.
function normalizeTestPushCode(value) {
const code = String(value || '').trim().toLowerCase();
if (code === 'отправлен' || code === 'sent') return 'sent';
if (code === 'доставлен' || code === 'delivered') return 'delivered';
if (code === 'ошибка' || code === 'error') return 'error';
return 'never';
}
function testPushText(code) {
const keys = { sent: 'test_push_sent', delivered: 'test_push_delivered', error: 'test_push_error' };
return keys[code] ? t(`screens.pwa_diagnostics_view.${keys[code]}`) : t('screens.pwa_diagnostics_view.text_033');
}
function toneFor(code, type = 'binary') {
if (type === 'permission') return { granted: 'ok', default: 'warn', denied: 'bad' }[code] || 'neutral';
if (type === 'testPush') return { delivered: 'ok', sent: 'warn', error: 'bad' }[code] || 'neutral';
if (type === 'install') return { installed: 'ok', prompt: 'ok', unavailable: 'warn', unknown: 'warn' }[code] || 'neutral';
if (type === 'launchMode') return ['standalone', 'fullscreen', 'browser'].includes(code) ? 'ok' : 'neutral';
if (['yes', 'found', 'registered', 'supported', 'present'].includes(code)) return 'ok';
if (['no', 'missing', 'not_registered', 'error', 'unavailable'].includes(code)) return 'bad';
return 'neutral';
}
@@ -114,25 +117,34 @@ async function collectDiagnostics() {
const result = {
secureContext: window.isSecureContext === true,
manifestStatus: t('screens.pwa_diagnostics_view.text_027'),
manifestCode: 'missing',
manifestUrl: '',
swStatus: t('screens.pwa_diagnostics_view.text_028'),
swCode: 'not_registered',
swError: '',
launchMode: detectLaunchMode(),
installAvailability: t('screens.pwa_diagnostics_view.text_029'),
installCode: 'unknown',
notificationsApi: t('screens.pwa_diagnostics_view.text_030'),
notificationsApiCode: 'no',
pushApi: t('screens.pwa_diagnostics_view.text_031'),
pushApiCode: 'no',
notificationPermission: 'default',
pushSubscription: t('screens.pwa_diagnostics_view.text_032'),
subscriptionCode: 'no',
subscriptionEndpoint: '',
subscriptionUpdatedAtMs: 0,
lastTestPush: t('screens.pwa_diagnostics_view.text_033'),
lastTestPushCode: 'never',
lastTestPushAtMs: 0,
lastPushPayload: null,
iosSafariHint: false,
tech: {},
};
result.notificationsApiCode = 'Notification' in window ? 'supported' : 'no';
result.notificationsApi = 'Notification' in window ? t('screens.pwa_diagnostics_view.text_034') : t('screens.pwa_diagnostics_view.text_035');
result.pushApiCode = 'PushManager' in window ? 'supported' : 'no';
result.pushApi = 'PushManager' in window ? t('screens.pwa_diagnostics_view.text_036') : t('screens.pwa_diagnostics_view.text_037');
if ('Notification' in window) {
result.notificationPermission = String(Notification.permission || 'default');
@@ -144,6 +156,7 @@ async function collectDiagnostics() {
if (href) {
const url = new URL(href, window.location.href).toString();
const resp = await fetch(url, { cache: 'no-store' });
result.manifestCode = resp.ok ? 'found' : 'missing';
result.manifestStatus = resp.ok ? t('screens.pwa_diagnostics_view.text_038') : t('screens.pwa_diagnostics_view.text_039');
result.manifestUrl = url;
} else {
@@ -157,8 +170,10 @@ async function collectDiagnostics() {
if ('serviceWorker' in navigator) {
try {
registration = await navigator.serviceWorker.getRegistration();
result.swCode = registration ? 'registered' : 'not_registered';
result.swStatus = registration ? t('screens.pwa_diagnostics_view.text_040') : t('screens.pwa_diagnostics_view.text_041');
} catch (error) {
result.swCode = 'error';
result.swStatus = t('screens.pwa_diagnostics_view.text_050');
result.swError = error?.message || 'unknown';
}
@@ -166,23 +181,26 @@ async function collectDiagnostics() {
result.swStatus = t('screens.pwa_diagnostics_view.text_051');
}
result.installAvailability = buildInstallState({
result.installCode = buildInstallState({
launchMode: result.launchMode,
manifestOk: result.manifestStatus === 'найден',
swRegistered: result.swStatus === 'зарегистрирован',
manifestOk: result.manifestCode === 'found',
swRegistered: result.swCode === 'registered',
});
result.installAvailability = installStateText(result.installCode);
if (registration && ('PushManager' in window)) {
try {
const subscription = await registration.pushManager.getSubscription();
if (subscription) {
result.subscriptionCode = 'present';
result.pushSubscription = t('screens.pwa_diagnostics_view.text_052');
result.subscriptionEndpoint = String(subscription.endpoint || '');
} else {
result.pushSubscription = t('screens.pwa_diagnostics_view.text_053');
}
} catch (error) {
result.pushSubscription = t('screens.pwa_diagnostics_view.text_054');
result.subscriptionCode = 'error';
result.pushSubscription = t('screens.pwa_diagnostics_view.text_054');
result.swError = result.swError || (error?.message || 'unknown');
}
}
@@ -197,7 +215,10 @@ async function collectDiagnostics() {
try {
const st = String(localStorage.getItem(LS_LAST_TEST_STATUS_KEY) || '').trim();
const at = Number(localStorage.getItem(LS_LAST_TEST_AT_KEY) || 0);
if (st) result.lastTestPush = st;
if (st) {
result.lastTestPushCode = normalizeTestPushCode(st);
result.lastTestPush = testPushText(result.lastTestPushCode);
}
if (Number.isFinite(at) && at > 0) result.lastTestPushAtMs = at;
} catch {
// ignore
@@ -221,13 +242,18 @@ async function collectDiagnostics() {
launchMode: result.launchMode,
canInstallPrompt: canInstallPwa(),
swStatus: result.swStatus,
swCode: result.swCode,
swError: result.swError,
manifestStatus: result.manifestStatus,
manifestCode: result.manifestCode,
manifestUrl: result.manifestUrl,
pushSubscription: result.pushSubscription,
subscriptionCode: result.subscriptionCode,
installCode: result.installCode,
subscriptionEndpoint: result.subscriptionEndpoint,
subscriptionUpdatedAtMs: result.subscriptionUpdatedAtMs,
lastTestPush: result.lastTestPush,
lastTestPushCode: result.lastTestPushCode,
lastTestPushAtMs: result.lastTestPushAtMs,
lastPushPayload: result.lastPushPayload,
};
@@ -240,10 +266,10 @@ function buildRecommendations(diag) {
if (!diag.secureContext) {
rows.push(t('screens.pwa_diagnostics_view.text_068'));
}
if (diag.manifestStatus !== 'найден') {
if (diag.manifestCode !== 'found') {
rows.push(t('screens.pwa_diagnostics_view.text_069'));
}
if (diag.swStatus !== 'зарегистрирован') {
if (diag.swCode !== 'registered') {
rows.push(t('screens.pwa_diagnostics_view.text_070'));
}
if (diag.notificationPermission === 'default') {
@@ -251,10 +277,10 @@ function buildRecommendations(diag) {
} else if (diag.notificationPermission === 'denied') {
rows.push(t('screens.pwa_diagnostics_view.text_072'));
}
if (diag.pushSubscription !== 'есть') {
if (diag.subscriptionCode !== 'present') {
rows.push(t('screens.pwa_diagnostics_view.text_073'));
}
if (diag.installAvailability === 'доступна кнопка установки') {
if (diag.installCode === 'prompt') {
rows.push(t('screens.pwa_diagnostics_view.text_074'));
}
if (diag.iosSafariHint) {
@@ -329,16 +355,16 @@ export function render({navigate, chrome}) {
statusList.innerHTML = '';
statusList.append(
rowEl('HTTPS', latestDiag.secureContext ? t('screens.pwa_diagnostics_view.text_042') : t('screens.pwa_diagnostics_view.text_043'), toneFor(latestDiag.secureContext ? t('screens.pwa_diagnostics_view.text_044') : t('screens.pwa_diagnostics_view.text_045'))),
rowEl('Manifest', latestDiag.manifestStatus, toneFor(latestDiag.manifestStatus)),
rowEl('Service Worker', latestDiag.swStatus, toneFor(latestDiag.swStatus)),
rowEl(t('screens.pwa_diagnostics_view.text_006'), latestDiag.launchMode, toneFor(latestDiag.launchMode, 'launchMode')),
rowEl(t('screens.pwa_diagnostics_view.text_007'), latestDiag.installAvailability, toneFor(latestDiag.installAvailability, 'install')),
rowEl('Notifications API', latestDiag.notificationsApi, toneFor(latestDiag.notificationsApi)),
rowEl('Push API', latestDiag.pushApi, toneFor(latestDiag.pushApi)),
rowEl('HTTPS', latestDiag.secureContext ? t('screens.pwa_diagnostics_view.text_042') : t('screens.pwa_diagnostics_view.text_043'), toneFor(latestDiag.secureContext ? 'yes' : 'no')),
rowEl('Manifest', latestDiag.manifestStatus, toneFor(latestDiag.manifestCode)),
rowEl('Service Worker', latestDiag.swStatus, toneFor(latestDiag.swCode)),
rowEl(t('screens.pwa_diagnostics_view.text_006'), latestDiag.launchMode === 'browser' ? t('screens.pwa_diagnostics_view.text_022') : latestDiag.launchMode, toneFor(latestDiag.launchMode, 'launchMode')),
rowEl(t('screens.pwa_diagnostics_view.text_007'), latestDiag.installAvailability, toneFor(latestDiag.installCode, 'install')),
rowEl('Notifications API', latestDiag.notificationsApi, toneFor(latestDiag.notificationsApiCode)),
rowEl('Push API', latestDiag.pushApi, toneFor(latestDiag.pushApiCode)),
rowEl(t('screens.pwa_diagnostics_view.text_008'), latestDiag.notificationPermission, toneFor(latestDiag.notificationPermission, 'permission')),
rowEl('Push subscription', latestDiag.pushSubscription, toneFor(latestDiag.pushSubscription)),
rowEl(t('screens.pwa_diagnostics_view.text_009'), latestDiag.lastTestPush, toneFor(latestDiag.lastTestPush, 'testPush')),
rowEl('Push subscription', latestDiag.pushSubscription, toneFor(latestDiag.subscriptionCode)),
rowEl(t('screens.pwa_diagnostics_view.text_009'), latestDiag.lastTestPush, toneFor(latestDiag.lastTestPushCode, 'testPush')),
);
if (latestDiag.subscriptionEndpoint) {
@@ -375,7 +401,7 @@ export function render({navigate, chrome}) {
if (latestDiag.swError) {
setInfo(t('screens.pwa_diagnostics_view.text_055', { value1: latestDiag.swError }));
} else {
setInfo(t('screens.pwa_diagnostics_view.text_056', { value1: new Date().toLocaleTimeString('ru-RU') }));
setInfo(t('screens.pwa_diagnostics_view.text_056', { value1: formatTime(new Date()) }));
}
};
@@ -487,7 +513,7 @@ export function render({navigate, chrome}) {
actions.querySelector('#diag-testpush').addEventListener('click', async (event) => {
await withButtonBusy(event.currentTarget, async () => {
try {
localStorage.setItem(LS_LAST_TEST_STATUS_KEY, 'отправлен');
localStorage.setItem(LS_LAST_TEST_STATUS_KEY, 'sent');
localStorage.setItem(LS_LAST_TEST_AT_KEY, String(Date.now()));
} catch {
// ignore
@@ -502,7 +528,7 @@ export function render({navigate, chrome}) {
await reloadStatuses();
}).catch(async (error) => {
try {
localStorage.setItem(LS_LAST_TEST_STATUS_KEY, 'ошибка');
localStorage.setItem(LS_LAST_TEST_STATUS_KEY, 'error');
localStorage.setItem(LS_LAST_TEST_AT_KEY, String(Date.now()));
} catch {
// ignore
@@ -1,3 +1,4 @@
import { formatDateTime } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { createTopBar } from '../components/topbar.js';
import { toUserMessage } from '../services/ui-error-texts.js';
@@ -17,7 +18,7 @@ export const pageMeta = { id: 'remote-addblock-session-view', get title() { retu
const SESSION_TYPE_HOMESERVER = 100;
function formatSessionTime(ms) {
return new Date(ms).toLocaleString('ru-RU', {
return formatDateTime(new Date(ms), {
day: '2-digit',
month: '2-digit',
year: 'numeric',
+1 -1
View File
@@ -48,7 +48,7 @@ export function render({navigate, chrome}) {
row.innerHTML = `
<div class="row">
<span class="field-label">${label}<small class="key-card__hint">${hint}</small></span>
<button class="icon-btn key-toggle-btn" type="button" data-toggle="${id}" aria-label="Показать ключ" title="Показать ключ">${eyeIcon}</button>
<button class="icon-btn key-toggle-btn" type="button" data-toggle="${id}" aria-label="${th('remaining.html_show_keys_view.show_key')}" title="${th('remaining.html_show_keys_view.show_key')}">${eyeIcon}</button>
</div>
<div class="key-value key-value--compact" data-value="${id}">*****</div>
`;
+1 -1
View File
@@ -84,7 +84,7 @@ export function render({ navigate, route, chrome }) {
const r = relation;
const theyFriend = r.inFriend || r.inCloseFriend;
let icon = 'user-plus';
let label = 'Добавить связь';
let label = t('remaining.profile.add_connection');
let hint = '';
if (r.outCloseFriend) { icon = 'check'; label = t('screens.user_profile_view.text_013'); }
else if (r.outFriend) { icon = 'check'; label = t('screens.user_profile_view.text_014'); }
+18 -17
View File
@@ -1,3 +1,4 @@
import { formatDateTime, formatNumber } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import { getSolanaCluster, confirmSolanaTransactionHttp } from '../services/solana-rpc-gateway.js';
import { createTopBar } from '../components/topbar.js';
@@ -41,7 +42,7 @@ import {
export const pageMeta = { id: 'wallet-view', get title() { return t('screens.wallet_view.text_001'); } };
function nowRu() {
return new Date().toLocaleString('ru-RU');
return formatDateTime(new Date());
}
function formatKbFromBytes(rawBytes) {
@@ -50,13 +51,13 @@ function formatKbFromBytes(rawBytes) {
: Number(rawBytes || 0);
if (!Number.isFinite(bytes) || bytes <= 0) return '0 KB';
const kb = bytes / 1024;
return `${kb.toLocaleString('ru-RU', { minimumFractionDigits: 2, maximumFractionDigits: 2 })} KB`;
return `${formatNumber(kb, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} KB`;
}
function formatBytesRu(rawBytes) {
const bytes = typeof rawBytes === 'bigint' ? Number(rawBytes) : Number(rawBytes || 0);
if (!Number.isFinite(bytes) || bytes <= 0) return '0 B';
return bytes.toLocaleString('ru-RU');
return formatNumber(bytes);
}
function normalizeHex64(value) {
@@ -66,7 +67,7 @@ function normalizeHex64(value) {
function lamportsToSolText(lamportsBigInt) {
const value = Number(lamportsBigInt || 0n) / 1_000_000_000;
return value.toLocaleString('ru-RU', { minimumFractionDigits: 0, maximumFractionDigits: 9 });
return formatNumber(value, { minimumFractionDigits: 0, maximumFractionDigits: 9 });
}
function formatLimitTopupError(error) {
@@ -244,7 +245,7 @@ function trimZeros(value) {
function formatUsdCentsText(cents) {
const value = Number(cents || 0n) / 100;
return value.toLocaleString('ru-RU', { minimumFractionDigits: 0, maximumFractionDigits: 2 });
return formatNumber(value, { minimumFractionDigits: 0, maximumFractionDigits: 2 });
}
function formatPpmCoefText(coefPpm) {
@@ -254,7 +255,7 @@ function formatPpmCoefText(coefPpm) {
function formatLamportsSolText(lamports, digits = 9) {
const value = Number(lamports || 0n) / Number(LAMPORTS_PER_SOL);
return value.toLocaleString('ru-RU', { minimumFractionDigits: 0, maximumFractionDigits: digits });
return formatNumber(value, { minimumFractionDigits: 0, maximumFractionDigits: digits });
}
function formatPythSolUsdText(pyth) {
@@ -386,7 +387,7 @@ async function deriveSupportRandomWallet(extraText) {
address: keypair.publicKey.toBase58(),
privateKey32Base58: encodeBase58(seed),
keypair,
generatedAt: new Date().toLocaleString('ru-RU'),
generatedAt: formatDateTime(new Date()),
};
}
@@ -881,7 +882,7 @@ export function render({navigate, chrome}) {
const ticketInfo = await core.connection.getAccountInfo(ticketPda, 'confirmed');
if (!ticketInfo) {
result.innerHTML = `
<p class="meta-muted" style="margin:0;">Билет ${formatSupportTicketLabel(parsed.queueId, parsed.index)} пока не создан.</p>
<p class="meta-muted" style="margin:0;">${th('remaining.html_wallet_view.ticket')}${formatSupportTicketLabel(parsed.queueId, parsed.index)}${th('remaining.html_wallet_view.has_not_been_created_yet')}</p>
`;
return;
}
@@ -903,12 +904,12 @@ export function render({navigate, chrome}) {
<div><b>${th('screens.wallet_view.text_213')}</b> ${formatSupportTicketLabel(parsed.queueId, ticket.index)}</div>
<div><b>${th('screens.wallet_view.text_214')}</b> ${ticket.isPaid ? t('screens.wallet_view.text_112') : t('screens.wallet_view.text_113')}</div>
<div><b>${th('screens.wallet_view.text_215')}</b> <span style="word-break:break-all;">${ticket.recipientWallet}</span></div>
<div><b>${th('screens.wallet_view.text_216')}</b> ${ticketsBefore.toString()} билетов</div>
<div><b>${th('screens.wallet_view.text_217')}</b> ${paidBefore.toString()} билетов</div>
<div><b>${th('screens.wallet_view.text_218')}</b> ${remainingBefore.toString()} билетов</div>
<div><b>${th('screens.wallet_view.text_216')}</b> ${ticketsBefore.toString()}${th('remaining.html_wallet_view.tickets_div')}
<div><b>${th('screens.wallet_view.text_217')}</b> ${paidBefore.toString()}${th('remaining.html_wallet_view.tickets_div')}
<div><b>${th('screens.wallet_view.text_218')}</b> ${remainingBefore.toString()}${th('remaining.html_wallet_view.tickets_div')}
<div><b>${th('screens.wallet_view.text_219')}</b> ${formatUsdCentsText(queueState.sumPaidUsdCents)} USD</div>
<div><b>${th('screens.wallet_view.text_220')}</b> ${formatUsdCentsText(ticket.payoutUsdCents)} USD</div>
<div><b>${th('screens.wallet_view.text_221')}</b> ${formatUsdCentsText(ticket.debtBeforeUsdCents)} USD в очереди до него</div>
<div><b>${th('screens.wallet_view.text_221')}</b> ${formatUsdCentsText(ticket.debtBeforeUsdCents)}${th('remaining.html_wallet_view.usd_ahead_of_it_in_the_queue_div')}
`;
}
setStatus(t('screens.wallet_view.text_158', { value1: formatSupportTicketLabel(ticket.queueId, ticket.index), value2: endpoint }));
@@ -1264,10 +1265,10 @@ export function render({navigate, chrome}) {
if (modeToken !== activeModeToken) return;
setStatus(t('screens.wallet_view.text_161', { value1: formatQueuePrefix(ticket.queueId), value2: ticket.index.toString() }));
purchaseResultCard.innerHTML = `
<div><b>${th('screens.wallet_view.text_260')}</b> билет ${formatQueuePrefix(ticket.queueId)}-${ticket.index.toString()}</div>
<div><b>${th('screens.wallet_view.text_260')}</b>${th('remaining.html_wallet_view.ticket_single')}${formatQueuePrefix(ticket.queueId)}-${ticket.index.toString()}</div>
<div><b>${th('screens.wallet_view.text_261')}</b> <span style="word-break:break-all;">${ticket.recipientWallet}</span></div>
<div><b>${th('screens.wallet_view.text_262')}</b> ${formatUsdCentsText(ticket.payoutUsdCents)} USD</div>
<div><b>${th('screens.wallet_view.text_263')}</b> ${ticket.index > 0n ? (ticket.index - 1n).toString() : '0'} билетов</div>
<div><b>${th('screens.wallet_view.text_263')}</b> ${ticket.index > 0n ? (ticket.index - 1n).toString() : '0'}${th('remaining.html_wallet_view.tickets_div')}
<div><b>${th('screens.wallet_view.text_264')}</b> <span style="word-break:break-all;">${signature}</span></div>
`;
await refreshCore();
@@ -1598,7 +1599,7 @@ export function render({navigate, chrome}) {
publicationMainEl.textContent = t('screens.wallet_view.text_029');
}
let localStatusText = 'Локального слепка нет.';
let localStatusText = t('remaining.wallet.no_local_snapshot');
const localMatchesServer = localSnapshot
&& String(localSnapshot.blockchainName || '') === String(usage.blockchainName || serverState.blockchainName || '')
&& Number(localSnapshot.lastBlockNumber) === Number(serverState.lastNumber)
@@ -1645,9 +1646,9 @@ export function render({navigate, chrome}) {
localHashEl.textContent = `Hash: ${localSnapshot.lastBlockHash || '–'}`;
localSizeEl.textContent = t('screens.wallet_view.text_177', { value1: formatBytesRu(localSnapshot.usedBytes || 0) });
localArweaveEl.textContent = `Arweave tx: ${localSnapshot.txId}`;
localCreatedEl.textContent = t('screens.wallet_view.text_178', { value1: localSnapshot.uploadedAtMs ? new Date(localSnapshot.uploadedAtMs).toLocaleString('ru-RU') : '–' });
localCreatedEl.textContent = t('screens.wallet_view.text_178', { value1: localSnapshot.uploadedAtMs ? formatDateTime(new Date(localSnapshot.uploadedAtMs)) : '–' });
localSolanaEl.textContent = localSnapshot.solanaUpdatedAtMs
? t('screens.wallet_view.text_179', { value1: new Date(localSnapshot.solanaUpdatedAtMs).toLocaleString('ru-RU') })
? t('screens.wallet_view.text_179', { value1: formatDateTime(new Date(localSnapshot.solanaUpdatedAtMs)) })
: t('screens.wallet_view.text_128');
} else {
localStateEl.textContent = t('screens.wallet_view.text_030');