Merge pull request #1498 from Bilb/chore-replace-i18n-calls

chore: rename localize calls

Author: Bilb

about_preload.js

@@ -16,7 +16,7 @@ const { initializeRendererProcessLogger } = require('./ts/util/logger/renderer_p
 
 initializeRendererProcessLogger();
 
-window.i18n = setupI18n({
+setupI18n({
   crowdinLocale,
 });
 

password_preload.js

@@ -17,7 +17,7 @@ const { initializeRendererProcessLogger } = require('./ts/util/logger/renderer_p
 
 initializeRendererProcessLogger();
 
-window.i18n = setupI18n({
+setupI18n({
   crowdinLocale,
 });
 

preload.js

@@ -23,7 +23,7 @@ const { initializeRendererProcessLogger } = require('./ts/util/logger/renderer_p
 
 initializeRendererProcessLogger();
 
-window.i18n = setupI18n({ crowdinLocale });
+setupI18n({ crowdinLocale });
 
 let title = config.name;
 if (config.environment !== 'production') {

stylesheets/_modules.scss

@@ -298,8 +298,6 @@
   }
 }
 
-
-
 // Module: Document List Item
 
 .module-document-list-item {

tools/localization/regex.py

@@ -11,12 +11,10 @@ def get_localization_regex_list(string):
     fr"\{{ token: '{key}'(, args: {{.*}})? \}}",
     # This also captures the same group as `basic_object` but this is fine because basic_object shortcuts before reaching here if found.
     fr"{{\s+token: '{key}',?\s+(\s*args: {{[\S\s.]*}},)?\s+\}}",
-    fr"window\.i18n\.(stripped|inEnglish|getRawMessage)\('{key}'(, {{[\S\s.]*}})?\)",
     fr"<I18n[\S\s.]*token=\{{?['\"]{key}['\"]\}}?",
     fr"<I18n[\S\s.]*token=[\S\s.]*{key}[\S\s.]*",
     fr"i18n\('{key}'\)",
     fr"i18n\('{key}'(, {{[\S\s.]*}})?\)",
-    fr"i18n\.(stripped|inEnglish|getRawMessage)\('{key}'(, {{[\S\s.]*}})?\)",
     fr"window\?\.i18n\?\.\('{key}'(, {{[\S\s.]*}})?\)"
   ]
 

ts/components/AboutView.tsx

@@ -10,7 +10,7 @@ import { themeStore } from '../state/theme/store';
 import { SessionButton, SessionButtonType } from './basic/SessionButton';
 import { Localizer } from './basic/Localizer';
 import { CopyToClipboardButton } from './buttons';
-import { localize } from '../localization/localeTools';
+import { tr } from '../localization/localeTools';
 
 const StyledContent = styled(Flex)`
   background-color: var(--background-primary-color);
@@ -60,18 +60,13 @@ export const AboutView = () => {
   }
 
   const version = window.getVersion();
-  const versionInfo = localize('updateVersion').withArgs({ version }).toString();
-  const systemInfo = localize('systemInformationDesktop')
-    .withArgs({
-      information: window.getOSRelease(),
-    })
-    .toString();
-  const commitInfo = localize('commitHashDesktop')
-    .withArgs({
-      hash: window.getCommitHash() || localize('unknown').toString(),
-    })
-    .toString();
-
+  const versionInfo = tr('updateVersion', { version });
+  const systemInfo = tr('systemInformationDesktop', {
+    information: window.getOSRelease(),
+  });
+  const commitInfo = tr('commitHashDesktop', {
+    hash: window.getCommitHash() || tr('unknown'),
+  });
   useEffect(() => {
     if (window.theme) {
       void switchThemeTo({

ts/components/EmptyMessageView.tsx

@@ -6,6 +6,7 @@ import { Flex } from './basic/Flex';
 import { Spacer2XL, SpacerXS } from './basic/Text';
 import { Localizer } from './basic/Localizer';
 import { useShowOnboardingAccountJustCreated } from '../state/selectors/settings';
+import { tr } from '../localization/localeTools';
 
 const StyledPlaceholder = styled(Flex)`
   background-color: var(--background-secondary-color);
@@ -87,7 +88,7 @@ export const EmptyMessageView = () => {
         <>
           <StyledPartyPopper src="images/party-popper.svg" alt="party popper emoji" />
           <Spacer2XL />
-          <StyledHeading>{window.i18n('onboardingAccountCreated')}</StyledHeading>
+          <StyledHeading>{tr('onboardingAccountCreated')}</StyledHeading>
           <StyledSessionWelcome color={'var(--renderer-span-primary-color)'}>
             <Localizer token="onboardingBubbleWelcomeToSession" args={{ emoji: '👋' }} />
           </StyledSessionWelcome>
@@ -109,10 +110,10 @@ export const EmptyMessageView = () => {
         <>
           <StyledHR />
           <StyledNoConversations data-testid="empty-conversation">
-            {window.i18n('conversationsNone')}
+            {tr('conversationsNone')}
           </StyledNoConversations>
           <SpacerXS />
-          <StyledP style={{ width: '360px' }}>{window.i18n('onboardingHitThePlusButton')}</StyledP>
+          <StyledP style={{ width: '360px' }}>{tr('onboardingHitThePlusButton')}</StyledP>
         </>
       ) : null}
     </StyledPlaceholder>

ts/components/MemberListItem.tsx

@@ -33,7 +33,7 @@ import {
 } from '../webworker/workers/browser/libsession_worker_interface';
 import { assertUnreachable } from '../types/sqlSharedTypes';
 import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import { localize } from '../localization/localeTools';
+import { tr } from '../localization/localeTools';
 
 const AvatarContainer = styled.div`
   position: relative;
@@ -169,29 +169,29 @@ const StyledGroupStatusText = styled.span<{ isFailure: boolean }>`
 function localisedStatusFromMemberStatus(memberStatus: MemberStateGroupV2) {
   switch (memberStatus) {
     case 'INVITE_FAILED':
-      return window.i18n('groupInviteFailed');
+      return tr('groupInviteFailed');
     case 'INVITE_NOT_SENT':
-      return window.i18n('groupInviteNotSent');
+      return tr('groupInviteNotSent');
     case 'INVITE_SENDING':
-      return window.i18n('groupInviteSending', { count: 1 });
+      return tr('groupInviteSending', { count: 1 });
     case 'INVITE_SENT':
-      return window.i18n('groupInviteSent');
+      return tr('groupInviteSent');
     case 'INVITE_UNKNOWN': // fallback, hopefully won't happen in production
-      return window.i18n('groupInviteStatusUnknown');
+      return tr('groupInviteStatusUnknown');
     case 'PROMOTION_UNKNOWN': // fallback, hopefully won't happen in production
-      return window.i18n('adminPromotionStatusUnknown');
+      return tr('adminPromotionStatusUnknown');
     case 'REMOVED_UNKNOWN': // fallback, hopefully won't happen in production
     case 'REMOVED_MEMBER': // we want pending removal members at the end of the "invite" states
     case 'REMOVED_MEMBER_AND_MESSAGES':
-      return window.i18n('groupPendingRemoval');
+      return tr('groupPendingRemoval');
     case 'PROMOTION_FAILED':
-      return window.i18n('adminPromotionFailed');
+      return tr('adminPromotionFailed');
     case 'PROMOTION_NOT_SENT':
-      return window.i18n('adminPromotionNotSent');
+      return tr('adminPromotionNotSent');
     case 'PROMOTION_SENDING':
-      return window.i18n('adminSendingPromotion', { count: 1 });
+      return tr('adminSendingPromotion', { count: 1 });
     case 'PROMOTION_SENT':
-      return window.i18n('adminPromotionSent');
+      return tr('adminPromotionSent');
     case 'PROMOTION_ACCEPTED':
       return null; // no statuses for accepted state;
     case 'INVITE_ACCEPTED':
@@ -269,7 +269,7 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP
       dataTestId={'resend-invite-button'}
       buttonShape={SessionButtonShape.Square}
       buttonType={SessionButtonType.Solid}
-      text={window.i18n('resend')}
+      text={tr('resend')}
       disabled={resendButtonDisabled}
       onClick={async () => {
         const group = await UserGroupsWrapperActions.getGroup(groupPk);
@@ -311,7 +311,7 @@ const PromoteButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Group
       buttonShape={SessionButtonShape.Square}
       buttonType={SessionButtonType.Solid}
       buttonColor={SessionButtonColor.Danger}
-      text={window.i18n('promote')}
+      text={tr('promote')}
       onClick={() => {
         void promoteUsersInGroup({
           groupPk,
@@ -342,7 +342,7 @@ export const MemberListItem = <T extends string>({
 }: MemberListItemProps<T>) => {
   const memberName = useNicknameOrProfileNameOrShortenedPubkey(pubkey);
   const isYou = isUsAnySogsFromCache(pubkey);
-  const ourName = isYou ? localize('you').toString() : null;
+  const ourName = isYou ? tr('you') : null;
   const shortPubkey = PubKey.shorten(pubkey);
   const nameSuffix =
     isPublic && inMentions && !isYou && memberName !== shortPubkey ? shortPubkey : '';

ts/components/SessionPasswordPrompt.tsx

@@ -12,7 +12,7 @@ import { SessionToastContainer } from './SessionToastContainer';
 import { SessionToast } from './basic/SessionToast';
 import { SessionSpinner } from './loading';
 import { Localizer } from './basic/Localizer';
-import { localize } from '../localization/localeTools';
+import { tr } from '../localization/localeTools';
 import {
   ModalBasicHeader,
   ModalActionsContainer,
@@ -58,16 +58,12 @@ function ClearDataViewButtons({ onCancel }: { onCancel: () => void }) {
   return (
     <ModalActionsContainer>
       <SessionButton
-        text={localize('clearDevice').toString()}
+        text={tr('clearDevice')}
         buttonColor={SessionButtonColor.Danger}
         buttonType={SessionButtonType.Simple}
         onClick={window.clearLocalData}
       />
-      <SessionButton
-        text={localize('cancel').toString()}
-        buttonType={SessionButtonType.Simple}
-        onClick={onCancel}
-      />
+      <SessionButton text={tr('cancel')} buttonType={SessionButtonType.Simple} onClick={onCancel} />
     </ModalActionsContainer>
   );
 }
@@ -93,15 +89,15 @@ function PasswordViewButtons({
     <ModalActionsContainer>
       {showResetElements && (
         <SessionButton
-          text={localize('clearDevice').toString()}
+          text={tr('clearDevice')}
           buttonColor={SessionButtonColor.Danger}
           buttonType={SessionButtonType.Simple}
           onClick={onShowClearDataView}
         />
       )}
       {!loading && (
         <SessionButton
-          text={showResetElements ? localize('tryAgain').toString() : localize('done').toString()}
+          text={showResetElements ? tr('tryAgain') : tr('done')}
           buttonType={SessionButtonType.Simple}
           onClick={initLogin}
           disabled={loading}
@@ -148,7 +144,7 @@ const PasswordPrompt = ({
 }) => {
   return (
     <ShowHideSessionInput
-      placeholder={localize('passwordEnter').toString()}
+      placeholder={tr('passwordEnter')}
       onEnterPressed={onEnterPressed}
       onValueChanged={onPasswordChange}
       ariaLabel="password input"
@@ -194,9 +190,7 @@ const SessionPasswordPromptInner = () => {
   return (
     <SessionWrapperModal
       headerChildren={
-        <ModalBasicHeader
-          title={localize(clearDataView ? 'clearDevice' : 'passwordEnter').toString()}
-        />
+        <ModalBasicHeader title={tr(clearDataView ? 'clearDevice' : 'passwordEnter')} />
       }
       $contentMinWidth={WrapperModalWidth.narrow}
       buttonChildren={

ts/components/SessionQRCode.tsx

@@ -5,6 +5,7 @@ import { THEME_GLOBALS } from '../themes/globals';
 import { renderQRCode } from '../util/qrCodes';
 import { AnimatedFlex } from './basic/Flex';
 import { SessionIconType } from './icon';
+import { tr } from '../localization/localeTools';
 
 // AnimatedFlex because we fade in the QR code a flicker on first render
 const StyledQRView = styled(AnimatedFlex)<{
@@ -113,7 +114,7 @@ export function SessionQRCode(props: SessionQRCodeProps) {
       $alignItems="center"
       size={size}
       id={id}
-      title={window.i18n('download')}
+      title={tr('download')}
       aria-label={ariaLabel || 'QR code'}
       onClick={(event: MouseEvent<HTMLDivElement>) => {
         event.preventDefault();