From e1f2393c3a89ba354eadcb6a6b3d4fc2823f8ef8 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 7 Mar 2022 13:21:24 +1100 Subject: [PATCH] cleanup translated strings --- _locales/en/messages.json | 31 ------------------ app/menu.js | 6 +--- debug_log.html | 2 +- js/background.js | 9 ------ js/views/debug_log_view.js | 6 ++-- tools/updateI18nKeysType.py | 2 ++ ts/components/conversation/Linkify.tsx | 2 +- ts/components/dialog/DeleteAccountModal.tsx | 1 - ts/components/dialog/SessionSeedModal.tsx | 2 +- ts/components/dialog/UserDetailsDialog.tsx | 2 +- ts/components/menu/Menu.tsx | 2 +- ts/session/utils/Toast.tsx | 4 --- ts/types/LocalizerKeys.ts | 35 ++------------------- 13 files changed, 13 insertions(+), 91 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index c5bcc8de5..da0d50793 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -16,7 +16,6 @@ "editMenuCut": "Cut", "editMenuCopy": "Copy", "editMenuPaste": "Paste", - "editMenuDelete": "Delete", "editMenuDeleteContact": "Delete Contact", "editMenuDeleteGroup": "Delete Group", "editMenuSelectAll": "Select all", @@ -34,18 +33,12 @@ "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ open group?", "enterSessionIDOrONSName": "Enter Session ID or ONS name", "loading": "Loading...", - "optimizingApplication": "Optimizing application...", "done": "Done", - "me": "Me", - "view": "View", "youLeftTheGroup": "You have left the group.", "youGotKickedFromGroup": "You were removed from the group.", - "unreadMessage": "Unread Message", "unreadMessages": "Unread Messages", "debugLogExplanation": "This log will be saved to your desktop.", "reportIssue": "Report an issue", - "gotIt": "Got it", - "submit": "Submit", "markAllAsRead": "Mark All as Read", "incomingError": "Error handling incoming message", "media": "Media", @@ -66,19 +59,13 @@ "fileSizeWarning": "Attachment exceeds size limits for the type of message you're sending.", "unableToLoadAttachment": "Sorry, there was an error setting your attachment.", "offline": "Offline", - "checkNetworkConnection": "Check your network connection.", - "attemptingReconnection": "Attempting reconnect in $reconnect_duration_in_seconds$ seconds", - "submitDebugLog": "Debug log", "debugLog": "Debug Log", "showDebugLog": "Show Debug Log", "goToReleaseNotes": "Go to Release Notes", "goToSupportPage": "Go to Support Page", - "menuReportIssue": "Report an Issue", "about": "About", - "speech": "Speech", "show": "Show", "sessionMessenger": "Session", - "search": "Search", "noSearchResults": "No results found for \"$searchTerm$\"", "conversationsHeader": "Contacts and Groups", "contactsHeader": "Contacts", @@ -90,9 +77,6 @@ "replyToMessage": "Reply to message", "replyingToMessage": "Replying to:", "originalMessageNotFound": "Original message not found", - "originalMessageNotAvailable": "Original message no longer available", - "messageFoundButNotLoaded": "Original message found, but not loaded. Scroll up to load it.", - "recording": "Recording", "you": "You", "audioPermissionNeededTitle": "Microphone Access Required", "audioPermissionNeeded": "You can enable microphone access under: Settings (Gear icon) => Privacy", @@ -133,14 +117,11 @@ "lightboxImageAlt": "Image sent in conversation", "imageCaptionIconAlt": "Icon showing that this image has a caption", "addACaption": "Add a caption...", - "copy": "Copy", "copySessionID": "Copy Session ID", "copyOpenGroupURL": "Copy Group's URL", "save": "Save", "saveLogToDesktop": "Save log to desktop", "saved": "Saved", - "permissions": "Permissions", - "general": "General", "tookAScreenshot": "$name$ took a screenshot", "savedTheFile": "Media saved by $name$", "linkPreviewsTitle": "Send Link Previews", @@ -151,7 +132,6 @@ "spellCheckTitle": "Spell Check", "spellCheckDescription": "Enable spell check of text entered in message composition box", "spellCheckDirty": "You must restart Session to apply your new settings", - "notifications": "Notifications", "readReceiptSettingDescription": "See and share when messages have been read (enables read receipts in all sessions).", "readReceiptSettingTitle": "Read Receipts", "typingIndicatorsSettingDescription": "See and share when messages are being typed (applies to all sessions).", @@ -168,13 +148,10 @@ "notificationFrom": "From:", "notificationMostRecent": "Most recent:", "sendFailed": "Send Failed", - "expiredWarning": "This version of Session has expired. Please upgrade to the latest version to continue messaging.", - "upgrade": "Upgrade", "mediaMessage": "Media message", "timestamp_s": "Now", "timestamp_m": "1 minute", "timestamp_h": "1 hour", - "timestampFormat_M": "MMM D", "messageBodyMissing": "Please enter a message body.", "unblockToSend": "Unblock this contact to send a message.", "unblockGroupToSend": "This group is blocked. Unlock it if you would like to send a message.", @@ -220,7 +197,6 @@ "startConversation": "Start New Conversation", "invalidNumberError": "Invalid Session ID or ONS Name", "failedResolveOns": "Failed to resolve ONS name", - "successUnlinked": "Your device was unlinked successfully", "autoUpdateSettingTitle": "Auto Update", "autoUpdateSettingDescription": "Automatically check for updates on startup", "autoUpdateNewVersionTitle": "Session update available", @@ -245,7 +221,6 @@ "blocked": "Blocked", "blockedSettingsTitle": "Blocked contacts", "unbanUser": "Unban User", - "unbanUserConfirm": "Are you sure you want to unban this user?", "userUnbanned": "User unbanned successfully", "userUnbanFailed": "Unban failed!", "banUser": "Ban User", @@ -276,7 +251,6 @@ "removeAccountPasswordDescription": "Remove the password associated with your account", "enterPassword": "Please enter your password", "confirmPassword": "Confirm password", - "pasteLongPasswordToastTitle": "The clipboard content exceeds the maximum password length of $max_pwd_len$ characters.", "showRecoveryPhrasePasswordRequest": "Please enter your password", "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.", "invalidOpenGroupUrl": "Invalid URL", @@ -329,7 +303,6 @@ "onlyAdminCanRemoveMembers": "You are not the creator", "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users", "createAccount": "Create account", - "signIn": "Sign In", "startInTrayTitle": "Keep in System Tray", "startInTrayDescription": "Session continues running in the background when you close the window", "yourUniqueSessionID": "Say hello to your Session ID", @@ -342,7 +315,6 @@ "anonymous": "Anonymous", "removeResidueMembers": "Clicking ok will also remove those members as they left the group.", "enterDisplayName": "Enter a display name", - "enterOptionalPassword": "Enter password (optional)", "continueYourSession": "Continue Your Session", "linkDevice": "Link Device", "restoreUsingRecoveryPhrase": "Restore your account", @@ -357,7 +329,6 @@ "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", - "permissionSettingsTitle": "Permissions", "privacySettingsTitle": "Privacy", "notificationsSettingsTitle": "Notifications", "recoveryPhraseEmpty": "Enter your recovery phrase", @@ -411,7 +382,6 @@ "pinConversationLimitTitle": "Pinned conversations limit", "pinConversationLimitToastDescription": "You can only pin $number$ conversations", "showUserDetails": "Show User Details", - "latestUnreadIsAbove": "First unread message is above", "sendRecoveryPhraseTitle": "Sending Recovery Phrase", "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?", "dialogClearAllDataDeletionFailedTitle": "Data not deleted", @@ -455,7 +425,6 @@ "callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to him first.", "callMediaPermissionsDescription": "Allows access to accept voice and video calls from other users", "callMediaPermissionsDialogContent": "The current implementation of voice/video calls will expose your IP address to the Oxen Foundation servers and the calling/called user.", - "menuCall": "Call", "startedACall": "You called $name$", "answeredACall": "Call with $name$", "trimDatabase": "Trim Database", diff --git a/app/menu.js b/app/menu.js index d83edc2a6..d6f920dec 100644 --- a/app/menu.js +++ b/app/menu.js @@ -56,7 +56,7 @@ exports.createTemplate = (options, messages) => { }, { role: 'delete', - label: messages.editMenuDelete, + label: messages.delete, }, { role: 'selectall', @@ -128,10 +128,6 @@ exports.createTemplate = (options, messages) => { label: messages.goToSupportPage, click: openSupportPage, }, - { - label: messages.menuReportIssue, - click: openNewBugForm, - }, { type: 'separator', }, diff --git a/debug_log.html b/debug_log.html index 8932956d4..b9b4bb311 100644 --- a/debug_log.html +++ b/debug_log.html @@ -27,7 +27,7 @@
- +
diff --git a/js/background.js b/js/background.js index 5b21c7d49..3eb206470 100644 --- a/js/background.js +++ b/js/background.js @@ -66,15 +66,6 @@ window.log.info('background page reloaded'); window.log.info('environment:', window.getEnvironment()); - const restartReason = localStorage.getItem('restart-reason'); - - if (restartReason === 'unlink') { - setTimeout(() => { - localStorage.removeItem('restart-reason'); - - window.libsession.Utils.ToastUtils.pushForceUnlinked(); - }, 2000); - } let initialLoadComplete = false; let newVersion = false; diff --git a/js/views/debug_log_view.js b/js/views/debug_log_view.js index fdfa18e0b..3b106dfa3 100644 --- a/js/views/debug_log_view.js +++ b/js/views/debug_log_view.js @@ -38,19 +38,19 @@ }); }, events: { - 'click .submit': 'submit', + 'click .submit': 'saveLogToDesktop', 'click .close': 'close', }, render_attributes: { title: i18n('debugLog'), cancel: i18n('cancel'), - submit: i18n('saveLogToDesktop'), + saveLogToDesktop: i18n('saveLogToDesktop'), debugLogExplanation: i18n('debugLogExplanation'), }, close() { window.closeDebugLog(); }, - async submit(e) { + async saveLogToDesktop(e) { e.preventDefault(); const text = this.$('textarea').val(); if (text.length === 0) { diff --git a/tools/updateI18nKeysType.py b/tools/updateI18nKeysType.py index ce3e0789f..42b37a8e8 100755 --- a/tools/updateI18nKeysType.py +++ b/tools/updateI18nKeysType.py @@ -22,6 +22,8 @@ with open(EN_FILE,'r') as jsonFile: keys = data.keys() stringToWrite += json.dumps(keys, sort_keys=True).replace(',', '\n |').replace('"', '\'')[1:-1] + + stringToWrite += ';\n' # print(stringToWrite) with open(LOCALIZED_KEYS_FILE, "w") as typeFile: typeFile.write(stringToWrite) diff --git a/ts/components/conversation/Linkify.tsx b/ts/components/conversation/Linkify.tsx index 7da46700f..b41a31365 100644 --- a/ts/components/conversation/Linkify.tsx +++ b/ts/components/conversation/Linkify.tsx @@ -46,7 +46,7 @@ export const Linkify = (props: Props): JSX.Element => { title: window.i18n('linkVisitWarningTitle'), message: window.i18n('linkVisitWarningMessage', url), okText: window.i18n('open'), - cancelText: window.i18n('copy'), + cancelText: window.i18n('editMenuCopy'), showExitIcon: true, onClickOk: openLink, onClickClose: () => { diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx index a116e7ff4..cf35c6b9a 100644 --- a/ts/components/dialog/DeleteAccountModal.tsx +++ b/ts/components/dialog/DeleteAccountModal.tsx @@ -18,7 +18,6 @@ const deleteDbLocally = async () => { await window.Signal.Data.close(); await window.Signal.Data.removeDB(); await window.Signal.Data.removeOtherData(); - // 'unlink' => toast will be shown on app restart window.localStorage.setItem('restart-reason', 'delete-account'); }; diff --git a/ts/components/dialog/SessionSeedModal.tsx b/ts/components/dialog/SessionSeedModal.tsx index bba69097a..08b8f4f2a 100644 --- a/ts/components/dialog/SessionSeedModal.tsx +++ b/ts/components/dialog/SessionSeedModal.tsx @@ -114,7 +114,7 @@ const Seed = (props: SeedProps) => {
{ copyRecoveryPhrase(recoveryPhrase); diff --git a/ts/components/dialog/UserDetailsDialog.tsx b/ts/components/dialog/UserDetailsDialog.tsx index c0f016b48..acefd700e 100644 --- a/ts/components/dialog/UserDetailsDialog.tsx +++ b/ts/components/dialog/UserDetailsDialog.tsx @@ -71,7 +71,7 @@ export const UserDetailsDialog = (props: Props) => {
{ diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index b80335b50..d6457d392 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -420,7 +420,7 @@ export const DisappearingMessageMenuItem = (): JSX.Element | null => { return ( // Remove the && false to make context menu work with RTL support {timerOptions.map(item => ( diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx index bc844d59d..945d53254 100644 --- a/ts/session/utils/Toast.tsx +++ b/ts/session/utils/Toast.tsx @@ -101,10 +101,6 @@ export function pushCopiedToClipBoard() { pushToastInfo('copiedToClipboard', window.i18n('copiedToClipboard')); } -export function pushForceUnlinked() { - pushToastInfo('successUnlinked', window.i18n('successUnlinked')); -} - export function pushRestartNeeded() { pushToastInfo('restartNeeded', window.i18n('spellCheckDirty')); } diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 39a58f526..2ad0e3a4f 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -1,8 +1,5 @@ export type LocalizerKeys = - | 'gotIt' | 'removePassword' - | 'editMenuDelete' - | 'signIn' | 'newClosedGroup' | 'userUnbanFailed' | 'changePassword' @@ -16,7 +13,6 @@ export type LocalizerKeys = | 'requestsPlaceholder' | 'closedGroupInviteFailMessage' | 'noContactsForGroup' - | 'originalMessageNotAvailable' | 'linkVisitWarningMessage' | 'anonymous' | 'viewMenuZoomOut' @@ -38,7 +34,6 @@ export type LocalizerKeys = | 'autoUpdateLaterButtonLabel' | 'maximumAttachments' | 'deviceOnly' - | 'expiredWarning' | 'beginYourSession' | 'typingIndicatorsSettingDescription' | 'changePasswordToastDescription' @@ -51,7 +46,6 @@ export type LocalizerKeys = | 'openGroupURL' | 'messageRequestsDescription' | 'hideMenuBarDescription' - | 'search' | 'pickClosedGroupMember' | 'ByUsingThisService...' | 'startConversation' @@ -77,7 +71,6 @@ export type LocalizerKeys = | 'appMenuHideOthers' | 'sendFailed' | 'enterPassword' - | 'me' | 'enterSessionIDOfRecipient' | 'dialogClearAllDataDeletionFailedMultiple' | 'pinConversationLimitToastDescription' @@ -132,7 +125,6 @@ export type LocalizerKeys = | 'contextMenuNoSuggestions' | 'recoveryPhraseRevealButtonText' | 'banUser' - | 'permissions' | 'answeredACall' | 'sendMessage' | 'recoveryPhraseRevealMessage' @@ -177,12 +169,10 @@ export type LocalizerKeys = | 'message' | 'mainMenuHelp' | 'open' - | 'pasteLongPasswordToastTitle' | 'nameAndMessage' | 'autoUpdateDownloadedMessage' | 'onionPathIndicatorTitle' | 'unknown' - | 'submitDebugLog' | 'mediaMessage' | 'addAsModerator' | 'closedGroupInviteFailTitlePlural' @@ -191,20 +181,17 @@ export type LocalizerKeys = | 'incomingCallFrom' | 'timerSetOnSync' | 'deleteMessages' - | 'editMenuSelectAll' | 'spellCheckTitle' | 'translation' - | 'copy' + | 'editMenuSelectAll' | 'messageBodyMissing' | 'timerOption_12_hours_abbreviated' | 'onlyAdminCanRemoveMembersDesc' - | 'recording' | 'kickedFromTheGroup' | 'windowMenuMinimize' | 'debugLog' | 'timerOption_0_seconds_abbreviated' | 'timerOption_5_minutes_abbreviated' - | 'enterOptionalPassword' | 'goToReleaseNotes' | 'unpinConversation' | 'viewMenuResetZoom' @@ -238,11 +225,9 @@ export type LocalizerKeys = | 'show' | 'cannotMixImageAndNonImageAttachments' | 'viewMenuToggleFullScreen' - | 'optimizingApplication' | 'goToSupportPage' | 'passwordsDoNotMatch' | 'createClosedGroupNamePrompt' - | 'upgrade' | 'audioMessageAutoplayDescription' | 'leaveAndRemoveForEveryone' | 'previewThumbnail' @@ -263,7 +248,6 @@ export type LocalizerKeys = | 'unableToLoadAttachment' | 'cameraPermissionNeededTitle' | 'editMenuRedo' - | 'view' | 'changeNicknameMessage' | 'close' | 'deleteMessageQuestion' @@ -289,16 +273,13 @@ export type LocalizerKeys = | 'originalMessageNotFound' | 'autoUpdateRestartButtonLabel' | 'deleteConversationConfirmation' - | 'unreadMessage' | 'timerOption_6_hours_abbreviated' | 'timerOption_1_week_abbreviated' | 'timerSetTo' - | 'unbanUserConfirm' | 'notificationSubtitle' | 'youChangedTheTimer' | 'updatedTheGroup' | 'leaveGroup' - | 'menuReportIssue' | 'continueYourSession' | 'invalidGroupNameTooShort' | 'notificationForConvo' @@ -317,13 +298,11 @@ export type LocalizerKeys = | 'contactsHeader' | 'openGroupInvitation' | 'callMissedCausePermission' - | 'messageFoundButNotLoaded' | 'mediaPermissionsDescription' | 'media' | 'noMembersInThisGroup' | 'saveLogToDesktop' | 'copyErrorAndQuit' - | 'speech' | 'onlyAdminCanRemoveMembers' | 'passwordTypeError' | 'createClosedGroupPlaceholder' @@ -355,7 +334,6 @@ export type LocalizerKeys = | 'dialogClearAllDataDeletionFailedTitle' | 'loading' | 'blockedSettingsTitle' - | 'checkNetworkConnection' | 'appMenuHide' | 'removeAccountPasswordTitle' | 'recoveryPhraseEmpty' @@ -369,12 +347,11 @@ export type LocalizerKeys = | 'removePasswordInvalid' | 'password' | 'usersCanShareTheir...' - | 'timestampFormat_M' | 'nicknamePlaceholder' | 'linkPreviewsTitle' | 'continue' | 'learnMore' - | 'successUnlinked' + | 'passwordCharacterError' | 'autoUpdateSettingTitle' | 'deleteForEveryone' | 'createSessionID' @@ -395,7 +372,6 @@ export type LocalizerKeys = | 'deleted' | 'closedGroupMaxSize' | 'messagesHeader' - | 'passwordCharacterError' | 'joinOpenGroup' | 'callMediaPermissionsDialogContent' | 'timerOption_1_day_abbreviated' @@ -417,7 +393,6 @@ export type LocalizerKeys = | 'timerOption_5_seconds_abbreviated' | 'removeFromModerators' | 'enterRecoveryPhrase' - | 'submit' | 'stagedImageAttachment' | 'thisWeek' | 'savedTheFile' @@ -425,14 +400,10 @@ export type LocalizerKeys = | 'linkVisitWarningTitle' | 'invalidPassword' | 'endCall' - | 'latestUnreadIsAbove' | 'connectingToServer' - | 'notifications' | 'settingsHeader' | 'autoUpdateNewVersionMessage' | 'oneNonImageAtATimeToast' - | 'menuCall' - | 'attemptingReconnection' | 'removePasswordTitle' | 'iAmSure' | 'selectMessage' @@ -440,7 +411,6 @@ export type LocalizerKeys = | 'delete' | 'changePasswordInvalid' | 'unblockGroupToSend' - | 'general' | 'timerOption_6_hours' | 'confirmPassword' | 'downloadAttachment' @@ -453,7 +423,6 @@ export type LocalizerKeys = | 'you' | 'documentsEmptyState' | 'unbanUser' - | 'permissionSettingsTitle' | 'notificationForConvo_mentions_only' | 'trustThisContactDialogDescription' | 'unknownCountry'