Combine strings.ts and swg-strings.ts (#3857)

Author: mhkawano

build_binaries.sh

@@ -19,8 +19,8 @@ import {CloseWindowRequest} from '../proto/api_messages';
 import {Doc, resolveDoc} from '../model/doc';
 import {FriendlyIframe} from './friendly-iframe';
 import {Graypane} from './graypane';
+import {I18N_STRINGS} from '../i18n/strings';
 import {LoadingView} from '../ui/loading-view';
-import {SWG_I18N_STRINGS} from '../i18n/swg-strings';
 import {UI_CSS} from '../ui/ui-css';
 import {View} from './view';
 import {
@@ -151,7 +151,7 @@ export class Dialog {
     const iframeCssClass =
       dialogConfig.iframeCssClassOverride || defaultIframeCssClass;
 
-    const title = msg(SWG_I18N_STRINGS.SWG_CTA, titleLang);
+    const title = msg(I18N_STRINGS.SWG_CTA, titleLang);
 
     this.iframe_ = new FriendlyIframe(doc.getWin().document, {
       'class': iframeCssClass,

src/components/dialog.ts

@@ -15,12 +15,10 @@
  */
 
 import {I18N_STRINGS} from './strings';
-import {SWG_I18N_STRINGS} from './swg-strings';
 
 /* Language code to string mapping. English is always provided. */
 export type Translation = {
   en: string;
 } & Record<string, string>;
 
 I18N_STRINGS satisfies Record<string, Translation>;
-SWG_I18N_STRINGS satisfies Record<string, Translation>;

src/i18n/strings.ts

@@ -29,8 +29,8 @@ import {ClientEvent} from '../api/client-event-manager-api';
 import {ClientEventManager} from './client-event-manager';
 import {Deps} from './deps';
 import {Doc} from '../model/doc';
+import {I18N_STRINGS} from '../i18n/strings';
 import {INTERNAL_RUNTIME_VERSION} from '../constants';
-import {SWG_I18N_STRINGS} from '../i18n/swg-strings';
 import {createElement} from '../utils/dom';
 import {feUrl} from './services';
 import {getCanonicalTag, getCanonicalUrl} from '../utils/url';
@@ -110,7 +110,7 @@ export class AnalyticsService {
     this.activityPorts_ = deps_.activities();
 
     this.iframe_ = createElement(this.doc_.getWin().document, 'iframe', {
-      'title': SWG_I18N_STRINGS.SWG_SERVICE.en,
+      'title': I18N_STRINGS.SWG_SERVICE.en,
     });
     setImportantStyles(this.iframe_, iframeStyles);
     this.doc_.getBody()?.appendChild(this.getElement());

src/i18n/swg-strings.ts

@@ -546,7 +546,7 @@ describes.realWin('AudienceActionIframeFlow', (env) => {
     expect(toast).not.to.be.null;
     expect(toast.src_).to.contain('flavor=custom');
     expect(decodeURI(toast.src_)).to.contain(
-      'Signup failed. Try signing up again.'
+      'Sign-up failed. Try signing up again.'
     );
   });
 

src/i18n/translation.ts

@@ -43,12 +43,12 @@ import {ClientConfigManager} from './client-config-manager';
 import {Deps} from './deps';
 import {DialogManager} from '../components/dialog-manager';
 import {EntitlementsManager} from './entitlements-manager';
+import {I18N_STRINGS} from '../i18n/strings';
 import {InterventionResult} from '../api/available-intervention';
 import {InterventionType} from '../api/intervention-type';
 import {Message} from '../proto/api_messages';
 import {ProductType} from '../api/subscriptions';
 import {PromptPreference} from './intervention';
-import {SWG_I18N_STRINGS} from '../i18n/swg-strings';
 import {StorageKeys} from '../utils/constants';
 import {Toast} from '../ui/toast';
 import {XhrFetcher} from './fetcher';
@@ -112,7 +112,7 @@ const autopromptTypeToProductTypeMapping: {
 
 const DEFAULT_PRODUCT_TYPE = ProductType.SUBSCRIPTION;
 
-const placeholderPatternForEmail = /<ph name="EMAIL".+?\/ph>/g;
+const placeholderPatternForEmail = /{EMAIL}/g;
 
 interface DirectCompleteAudienceActionResponse {
   updated?: boolean;
@@ -301,13 +301,13 @@ export class AudienceActionIframeFlow implements AudienceActionFlow {
     let customText = '';
     switch (this.params_.action) {
       case InterventionType.TYPE_REGISTRATION_WALL:
-        customText = msg(
-          SWG_I18N_STRINGS.REGWALL_ACCOUNT_CREATED,
-          lang
-        ).replace(placeholderPatternForEmail, userEmail);
+        customText = msg(I18N_STRINGS.REGWALL_ACCOUNT_CREATED, lang).replace(
+          placeholderPatternForEmail,
+          userEmail
+        );
         break;
       case InterventionType.TYPE_NEWSLETTER_SIGNUP:
-        customText = msg(SWG_I18N_STRINGS.NEWSLETTER_SIGNED_UP, lang).replace(
+        customText = msg(I18N_STRINGS.NEWSLETTER_SIGNED_UP, lang).replace(
           placeholderPatternForEmail,
           userEmail
         );
@@ -337,10 +337,10 @@ export class AudienceActionIframeFlow implements AudienceActionFlow {
     let customText = '';
     switch (this.params_.action) {
       case InterventionType.TYPE_REGISTRATION_WALL:
-        customText = msg(SWG_I18N_STRINGS.REGWALL_REGISTER_FAILED, lang);
+        customText = msg(I18N_STRINGS.REGWALL_REGISTER_FAILED, lang);
         break;
       case InterventionType.TYPE_NEWSLETTER_SIGNUP:
-        customText = msg(SWG_I18N_STRINGS.NEWSLETTER_SIGN_UP_FAILED, lang);
+        customText = msg(I18N_STRINGS.NEWSLETTER_SIGN_UP_FAILED, lang);
         break;
       default:
         // Do not show toast for other types.

src/runtime/analytics-service.ts

@@ -37,13 +37,13 @@ import {Doc, resolveDoc} from '../model/doc';
 import {Entitlements} from '../api/entitlements';
 import {EntitlementsManager} from './entitlements-manager';
 import {Fetcher, XhrFetcher} from './fetcher';
+import {I18N_STRINGS} from '../i18n/strings';
 import {InlineCtaApi} from './inline-cta-api';
 import {JsError} from './jserror';
 import {PageConfig} from '../model/page-config';
 import {PageConfigResolver} from '../model/page-config-resolver';
 import {PageConfigWriter} from '../model/page-config-writer';
 import {PayClient} from './pay-client';
-import {SWG_I18N_STRINGS} from '../i18n/swg-strings';
 import {Storage} from './storage';
 import {StorageKeys} from '../utils/constants';
 import {SubscribeResponse} from '../api/subscribe-response';
@@ -586,7 +586,7 @@ export class ConfiguredBasicRuntime implements Deps, BasicSubscriptions {
       // Fallback in case there is no active flow. This occurs when the entitlment check
       // runs as a redirect.
       const language = this.clientConfigManager().getLanguage();
-      const customText = msg(SWG_I18N_STRINGS.NO_MEMBERSHIP_FOUND, language);
+      const customText = msg(I18N_STRINGS.NO_MEMBERSHIP_FOUND, language);
       new Toast(
         this,
         feUrl('/toastiframe', {

src/runtime/audience-action-flow-test.js

@@ -20,7 +20,7 @@ import {ButtonOptions, SmartButtonOptions} from '../api/subscriptions';
 import {ConfiguredRuntime} from './runtime';
 import {Deps} from './deps';
 import {Doc} from '../model/doc';
-import {SWG_I18N_STRINGS} from '../i18n/swg-strings';
+import {I18N_STRINGS} from '../i18n/strings';
 import {SmartSubscriptionButtonApi, Theme} from './smart-button-api';
 import {createElement} from '../utils/dom';
 import {msg} from '../utils/i18n';
@@ -106,10 +106,7 @@ export class ButtonApi {
     if (options['lang']) {
       button.setAttribute('lang', options['lang']);
     }
-    button.setAttribute(
-      'title',
-      msg(SWG_I18N_STRINGS.SUBSCRIPTION_TITLE, button)
-    );
+    button.setAttribute('title', msg(I18N_STRINGS.SUBSCRIPTION_BUTTON, button));
     this.logSwgEvent_(AnalyticsEvent.IMPRESSION_SWG_BUTTON);
 
     return button;
@@ -142,10 +139,7 @@ export class ButtonApi {
     button./*OK*/ innerHTML = BUTTON_INNER_HTML.replace(
       '$theme$',
       theme!
-    ).replace(
-      '$textContent$',
-      msg(SWG_I18N_STRINGS.SUBSCRIPTION_TITLE, button)
-    );
+    ).replace('$textContent$', msg(I18N_STRINGS.SUBSCRIPTION_BUTTON, button));
     this.logSwgEvent_(AnalyticsEvent.IMPRESSION_SHOW_OFFERS_SWG_BUTTON);
 
     return button;
@@ -178,10 +172,7 @@ export class ButtonApi {
     button./*OK*/ innerHTML = BUTTON_INNER_HTML.replace(
       '$theme$',
       theme!
-    ).replace(
-      '$textContent$',
-      msg(SWG_I18N_STRINGS.CONTRIBUTION_TITLE, button)
-    );
+    ).replace('$textContent$', msg(I18N_STRINGS.CONTRIBUTION_BUTTON, button));
     this.logSwgEvent_(AnalyticsEvent.IMPRESSION_SHOW_CONTRIBUTIONS_SWG_BUTTON);
 
     return button;