add alternative access message in farsi

Jigsaw-Code · Oct 24, 2022 · 4a76996 · 4a76996
1 parent 010b48c
commit 4a76996
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/src/www/messages/en.json b/src/www/messages/en.json
@@ -72,7 +72,9 @@
   "server-added": "Added server “{serverName}”!",
   "server-connected": "Connected to “{serverName}”",
   "server-create-your-own": "Don’t have an access key?<br>Create your own at {openLink}our website{closeLink}.",
+  "server-create-your-own-access": "Don’t have an access key?<br>Create your own at {openLink}our website{closeLink} or<br>request an {openLink2}access key{closeLink}.",
   "server-create-your-own-zero-state": "Don’t have a server?<br>Create your own at {openLink}our website{closeLink}.",
+  "server-create-your-own-zero-state-access": "Don’t have a server?<br>Create your own at {openLink}our website{closeLink} or<br>request an {openLink2}access key{closeLink}.",
   "server-default-name": "Proxy Server",
   "server-default-name-outline": "Outline Server",
   "server-detected": "Please confirm that you want to add this server.",

diff --git a/src/www/messages/fa.json b/src/www/messages/fa.json
@@ -71,7 +71,9 @@
   "server-added": "سرور «{serverName}» اضافه شد!",
   "server-connected": "به «{serverName}» وصل شدید",
   "server-create-your-own": "کلید دسترسی ندارید؟<br>کلید دسترسی خودتان را در {openLink}وبسایت ما{closeLink} ایجاد کنید.",
+  "server-create-your-own-access": "کلید دسترسی ندارید؟<br>کلید دسترسی خودتان را در {openLink}وبسایت ما{closeLink} ایجاد کنید یا <br>یک {openLink2}کلید دسترسی{closeLink} درخواست کنید.",
   "server-create-your-own-zero-state": "سرور ندارید؟<br>سرور خودتان را در {openLink}وبسایت ما{closeLink} ایجاد کنید.",
+  "server-create-your-own-zero-state-access": "سرور ندارید؟<br>خود را در {openLink}وب سایت ما {closeLink}ایجاد کنید یا <br>یک {openLink2}کلید دسترسی{closeLink} درخواست کنید.",
   "server-default-name": "سرور پراکسی",
   "server-default-name-outline": "سرور Outline",
   "server-detected": "لطفاً تأیید کنید که می‌خواهید این سرور اضافه شود.",

diff --git a/src/www/ui_components/add-server-view.js b/src/www/ui_components/add-server-view.js
@@ -165,8 +165,14 @@ Polymer({
       <div class="footer center top-divider">
         <div
           id="addServerFooter"
+          hidden$="[[showAltAccessMessage]]"
           inner-h-t-m-l="[[localize('server-create-your-own', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'closeLink', '</a>')]]"
         ></div>
+        <div
+          id="addServerFooterAlt"
+          hidden$="[[!showAltAccessMessage]]"
+          inner-h-t-m-l="[[localize('server-create-your-own-access', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'openLink2', '<a href=https://www.reddit.com/r/outlinevpn/wiki/index/outline_vpn_access_keys/>', 'closeLink', '</a>')]]"
+        ></div>
         <div
           id="invalidAccessKeyFooter"
           hidden=""
@@ -201,10 +207,16 @@ Polymer({
 
   properties: {
     localize: Function,
+    language: String,
+    platform: String,
     accessKey: {
       type: String,
       observer: '_accessKeyChanged',
     },
+    showAltAccessMessage: {
+      type: Boolean,
+      computed: '_computeShowAltAccessMessage()',
+    },
   },
 
   ready: function() {
@@ -299,14 +311,21 @@ Polymer({
     input.toggleClass('input-invalid', input.invalid);
     if (input.invalid) {
       this.$.addServerFooter.hidden = true;
+      this.$.addServerFooterAlt.hidden = true;
       this.$.invalidAccessKeyFooter.hidden = false;
     } else {
-      this.$.addServerFooter.hidden = false;
+      this.$.addServerFooter.hidden = false || this.showAltAccessMessage;
+      this.$.addServerFooterAlt.hidden = false || !this.showAltAccessMessage;
       this.$.invalidAccessKeyFooter.hidden = true;
     }
   },
 
   _disallowScroll: function(event) {
     event.preventDefault();
   },
+
+  _computeShowAltAccessMessage() {
+    // Hack to show an alternative message
+    return this.language === 'fa' && this.platform !== 'ios';
+  },
 });
diff --git a/src/www/ui_components/app-root.js b/src/www/ui_components/app-root.js
@@ -271,7 +271,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         </app-header>
 
         <iron-pages id="pages" selected="[[page]]" attr-for-selected="name">
-          <servers-view name="servers" id="serversView" servers="[[servers]]" localize="[[localize]]"></servers-view>
+          <servers-view name="servers" id="serversView" servers="[[servers]]" localize="[[localize]]" language="[[language]]" platform="[[platform]]"></servers-view>
           <feedback-view name="feedback" id="feedbackView" localize="[[localize]]"></feedback-view>
           <about-view
             name="about"
@@ -389,7 +389,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         <a hidden="" id="toastUrl" href="[[toastUrl]]"></a>
       </paper-toast>
 
-      <add-server-view id="addServerView" localize="[[localize]]"></add-server-view>
+      <add-server-view id="addServerView" localize="[[localize]]" language="[[language]]" platform="[[platform]]"></add-server-view>
 
       <!-- Modal dialogs must be placed outside of app-header-layout, see
     /~https://github.com/PolymerElements/paper-dialog/issues/152 and

diff --git a/src/www/views/servers_view/index.ts b/src/www/views/servers_view/index.ts
@@ -108,8 +108,14 @@ Polymer({
         </div>
         <div
           class="footer subtle"
+          hidden$="[[showAltAccessMessage]]"
           inner-h-t-m-l="[[localize('server-create-your-own-zero-state', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'closeLink', '</a>')]]"
         ></div>
+        <div
+          class="footer subtle"
+          hidden$="[[!showAltAccessMessage]]"
+          inner-h-t-m-l="[[localize('server-create-your-own-zero-state-access', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'openLink2', '<a href=https://www.reddit.com/r/outlinevpn/wiki/index/outline_vpn_access_keys/>', 'closeLink', '</a>')]]"
+        ></div>
       </div>
       <user-comms-dialog
         id="autoConnectDialog"
@@ -131,11 +137,17 @@ Polymer({
 
   properties: {
     localize: Function,
+    language: String,
+    platform: String,
     servers: Array,
     shouldShowZeroState: {
       type: Boolean,
       computed: '_computeShouldShowZeroState(servers)',
     },
+    showAltAccessMessage: {
+      type: Boolean,
+      computed: '_computeShowAltAccessMessage()',
+    },
   },
 
   _computeShouldShowZeroState(servers: ServerListItem[]) {
@@ -145,4 +157,9 @@ Polymer({
   _requestPromptAddServer() {
     this.fire('PromptAddServerRequested', {});
   },
+
+  _computeShowAltAccessMessage() {
+    // Hack to show an alternative message
+    return this.language === 'fa' && this.platform !== 'ios';
+  },
 });