diff --git a/app/client/ui2018/ColorSelect.ts b/app/client/ui2018/ColorSelect.ts index 22caaa8c..b6d41d97 100644 --- a/app/client/ui2018/ColorSelect.ts +++ b/app/client/ui2018/ColorSelect.ts @@ -64,7 +64,7 @@ export function colorSelect( onSave, onOpen, onRevert, - placeholder = t('DefaultCellStyle'), + placeholder = t("Default cell style"), } = options; const selectBtn = cssSelectBtn( cssContent( @@ -188,12 +188,12 @@ function buildColorPicker(ctl: IOpenController, }), cssButtonRow( - primaryButton(t('Apply'), + primaryButton(t("Apply"), dom.on('click', () => ctl.close()), dom.boolAttr("disabled", notChanged), testId('colors-save') ), - basicButton(t('Cancel'), + basicButton(t("Cancel"), dom.on('click', () => revert()), testId('colors-cancel') ) diff --git a/app/client/ui2018/breadcrumbs.ts b/app/client/ui2018/breadcrumbs.ts index d89b62c3..cb13f67a 100644 --- a/app/client/ui2018/breadcrumbs.ts +++ b/app/client/ui2018/breadcrumbs.ts @@ -138,19 +138,20 @@ export function docBreadcrumbs( dom.maybe(options.isPublic, () => cssPublicIcon('PublicFilled', testId('bc-is-public'))), dom.domComputed((use) => { if (options.isSnapshot && use(options.isSnapshot)) { - return cssTag(t('Snapshot'), testId('snapshot-tag')); + return cssTag(t("snapshot"), testId('snapshot-tag')); } if (use(options.isFork)) { - return cssTag(t('Unsaved'), testId('unsaved-tag')); + return cssTag(t("unsaved"), testId('unsaved-tag')); } if (use(options.isRecoveryMode)) { - return cssAlertTag(t('RecoveryMode'), + return cssAlertTag(t("recovery mode"), dom('a', dom.on('click', () => options.cancelRecoveryMode()), icon('CrossSmall')), testId('recovery-mode-tag')); } if (use(options.isFiddle)) { - return cssTag(t('Fiddle'), tooltip({title: t('FiddleExplanation')}), testId('fiddle-tag')); + return cssTag(t("fiddle"), tooltip({title: t(`You may make edits, but they will create a new copy and will +not affect the original document.`)}), testId('fiddle-tag')); } }), separator(' / ', diff --git a/app/client/ui2018/menus.ts b/app/client/ui2018/menus.ts index a371c2bd..e8a19dab 100644 --- a/app/client/ui2018/menus.ts +++ b/app/client/ui2018/menus.ts @@ -189,7 +189,7 @@ export function multiSelect(selectedOptions: MutableObsArray, const selectedOptionsText = Computed.create(null, selectedOptionsSet, (use, selectedOpts) => { if (selectedOpts.size === 0) { - return options.placeholder ?? t('SelectFields'); + return options.placeholder ?? t("Select fields"); } const optionArray = Array.isArray(availableOptions) ? availableOptions : use(availableOptions); @@ -323,8 +323,8 @@ export function upgradableMenuItem(needUpgrade: boolean, action: () => void, ... export function upgradeText(needUpgrade: boolean, onClick: () => void) { if (!needUpgrade) { return null; } - return menuText(dom('span', t('WorkspacesAvailableOnTeamPlans'), - cssUpgradeTextButton(t('UpgradeNow'), dom.on('click', () => onClick())))); + return menuText(dom('span', t("* Workspaces are available on team plans. "), + cssUpgradeTextButton(t("Upgrade now"), dom.on('click', () => onClick())))); } /** diff --git a/app/client/ui2018/modals.ts b/app/client/ui2018/modals.ts index 5e67cf59..a126d867 100644 --- a/app/client/ui2018/modals.ts +++ b/app/client/ui2018/modals.ts @@ -306,13 +306,13 @@ export function saveModal(createFunc: (ctl: IModalControl, owner: MultiHolder) = cssModalTitle(options.title, testId('modal-title')), cssModalBody(options.body), cssModalButtons( - bigPrimaryButton(options.saveLabel || t('Save'), + bigPrimaryButton(options.saveLabel || t("Save"), dom.boolAttr('disabled', isSaveDisabled), dom.on('click', save), testId('modal-confirm'), ), options.extraButtons, - options.hideCancel ? null : bigBasicButton(t('Cancel'), + options.hideCancel ? null : bigBasicButton(t("Cancel"), dom.on('click', () => ctl.close()), testId('modal-cancel'), ), @@ -426,7 +426,7 @@ export function invokePrompt( const prom = new Promise((resolve) => { onResolve = resolve; }); - promptModal(title, onResolve!, btnText ?? t('Ok'), initial, placeholder, () => { + promptModal(title, onResolve!, btnText ?? t("Ok"), initial, placeholder, () => { if (onResolve) { onResolve(undefined); } diff --git a/app/client/ui2018/pages.ts b/app/client/ui2018/pages.ts index 9c0a4ed4..2bae3e61 100644 --- a/app/client/ui2018/pages.ts +++ b/app/client/ui2018/pages.ts @@ -37,11 +37,11 @@ export function buildPageDom(name: Observable, actions: PageActions, ... const pageMenu = () => [ menuItem(() => isRenaming.set(true), t("Rename"), testId('rename'), dom.cls('disabled', actions.isReadonly)), - menuItem(actions.onRemove, t('Remove'), testId('remove'), + menuItem(actions.onRemove, t("Remove"), testId('remove'), dom.cls('disabled', (use) => use(actions.isReadonly) || actions.isRemoveDisabled())), - menuItem(actions.onDuplicate, t('DuplicatePage'), testId('duplicate'), + menuItem(actions.onDuplicate, t("Duplicate Page"), testId('duplicate'), dom.cls('disabled', actions.isReadonly)), - dom.maybe(actions.isReadonly, () => menuText(t('NoEditAccess'))), + dom.maybe(actions.isReadonly, () => menuText(t("You do not have edit access to this document"))), ]; let pageElem: HTMLElement; diff --git a/app/client/ui2018/search.ts b/app/client/ui2018/search.ts index ade4acef..f2d9f1f6 100644 --- a/app/client/ui2018/search.ts +++ b/app/client/ui2018/search.ts @@ -146,7 +146,7 @@ export function searchBar(model: SearchModel, testId: TestId = noTestId) { model.isOpen.set(_value === undefined ? !model.isOpen.get() : _value); }, 100); const inputElem: HTMLInputElement = searchInput(model.value, {onInput: true}, - {type: 'text', placeholder: t('SearchInDocument')}, + {type: 'text', placeholder: t("Search in document")}, dom.on('blur', () => ( keepExpanded ? setTimeout(() => inputElem.focus(), 0) : @@ -187,7 +187,7 @@ export function searchBar(model: SearchModel, testId: TestId = noTestId) { const noMatch = use(model.noMatch); const isEmpty = use(model.isEmpty); if (isEmpty) { return null; } - if (noMatch) { return cssLabel(t("NoResults")); } + if (noMatch) { return cssLabel(t("No results")); } return [ cssArrowBtn( icon('Dropdown'), @@ -197,7 +197,7 @@ export function searchBar(model: SearchModel, testId: TestId = noTestId) { dom.on('click', () => model.findNext()), hoverTooltip( [ - t('FindNext'), + t("Find Next "), cssShortcut(`(${['Enter', allCommands.findNext.humanKeys].join(', ')})`), ], {key: 'searchArrowBtnTooltip'} @@ -211,7 +211,7 @@ export function searchBar(model: SearchModel, testId: TestId = noTestId) { dom.on('click', () => model.findPrev()), hoverTooltip( [ - t('FindPrevious'), + t("Find Previous "), cssShortcut(allCommands.findPrev.getKeysDesc()), ], {key: 'searchArrowBtnTooltip'}