Skip to content

Commit 241fb70

Browse files
taratatachtaratatach
authored
feat: Allow showing support page URL on error page (#4662)
 We add a new config option to provide a support page URL rather than a support email. This URL will be used in place of the support email link on the error page and the flagship's screen displayed when the app's security cannot be properly attested via the Play Services.
2 parents db8de69 + 92d994c commit 241fb70

23 files changed

Lines changed: 11314 additions & 11248 deletions

File tree

‎assets/locales/de.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,9 @@ msgstr "Gehe zu dir nach Hause"
350350
msgid "Error Application not found Button"
351351
msgstr "Diese Anwendung installieren"
352352

353+
msgid "Error Learn more"
354+
msgstr "Mehr erfahren:"
355+
353356
msgid "Error Contact us"
354357
msgstr "Ein Problem, eine Frage? Kontaktiere uns über"
355358

@@ -974,4 +977,4 @@ msgid "Mail Sharing File Changed Link Text"
974977
msgstr "See on Twake Drive"
975978

976979
msgid "Mail Sharing Folder Changed Intro"
977-
msgstr "Someone shared a folder with you:"
980+
msgstr "Someone shared a folder with you:"

‎assets/locales/en.po‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,9 @@ msgstr "Install this application"
467467
msgid "Error Address forgotten"
468468
msgstr "I have forgotten my address"
469469

470+
msgid "Error Learn more"
471+
msgstr "Learn more:"
472+
470473
msgid "Error Contact us"
471474
msgstr "A problem, a question? Contact us at"
472475

‎assets/locales/es.po‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,9 @@ msgstr "Ir a Inicio"
344344
msgid "Error Application not found Button"
345345
msgstr "Instalar esta aplicación"
346346

347+
msgid "Error Learn more"
348+
msgstr "Más información:"
349+
347350
msgid "Error Contact us"
348351
msgstr "¿Tiene un problema, una duda? Contáctenos en"
349352

‎assets/locales/fr.po‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,9 @@ msgstr "Installer cette application"
535535
msgid "Error Address forgotten"
536536
msgstr "J'ai oublié mon adresse"
537537

538+
msgid "Error Learn more"
539+
msgstr "En savoir plus :"
540+
538541
msgid "Error Contact us"
539542
msgstr "Un problème, une suggestion ? Contactez-nous à"
540543

‎assets/locales/ja.po‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,9 @@ msgstr "ホームに移動"
300300
msgid "Error Application not found Button"
301301
msgstr "このアプリケーションをインストール"
302302

303+
msgid "Error Learn more"
304+
msgstr "詳細を見る:"
305+
303306
msgid "Error Contact us"
304307
msgstr "問題、質問? お問い合わせは"
305308

‎assets/locales/nl_NL.po‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,9 @@ msgstr "Deze app installeren"
451451
msgid "Error Address forgotten"
452452
msgstr "Ik ben mijn adres vergeten"
453453

454+
msgid "Error Learn more"
455+
msgstr "Meer informatie:"
456+
454457
msgid "Error Contact us"
455458
msgstr "Problemen? Vragen? Neem contact met ons op:"
456459

‎assets/locales/ru.po‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,9 @@ msgstr "Установить это приложение"
518518
msgid "Error Address forgotten"
519519
msgstr "Я забыл мой адрес"
520520

521+
msgid "Error Learn more"
522+
msgstr "Узнать больше:"
523+
521524
msgid "Error Contact us"
522525
msgstr "Проблема, предложение? Свяжитесь с нами по адресу"
523526

‎assets/locales/vi.po‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ msgstr "Ứng dụng không tồn tại"
457457

458458
msgid "Error Application not found Message"
459459
msgstr ""
460-
""Chúng tôi không tìm thấy ứng dụng nào tương ứng với địa chỉ này trong Twake của bạn."
460+
"Chúng tôi không tìm thấy ứng dụng nào tương ứng với địa chỉ này trong Twake của bạn."
461461
"Có thể bạn đã nhập sai địa chỉ."
462462

463463
msgid "Error Application not found Action"
@@ -469,6 +469,9 @@ msgstr "Cài đặt ứng dụng này"
469469
msgid "Error Address forgotten"
470470
msgstr "Tôi đã quên địa chỉ Twake của mình"
471471

472+
msgid "Error Learn more"
473+
msgstr "Tìm hiểu thêm:"
474+
472475
msgid "Error Contact us"
473476
msgstr "Có thắc mắc hoặc sự cố? Liên hệ với chúng tôi tại"
474477

‎assets/templates/confirm_flagship.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@ <h1 class="h4 h2-md my-3 text-center">{{t "Authorize Confirm Flagship title"}}</
2929
</div>
3030
</div>
3131
<footer class="w-100">
32+
{{if .SupportPageURL}}
33+
<p class="text-center mb-3">
34+
{{t "Error Learn more" }} <a href="{{.SupportPageURL}}">{{.SupportPageURL}}</a>.
35+
</p>
36+
{{else if .SupportEmail}}
3237
<p class="text-center mb-3">
3338
{{t "Error Contact us" }} <a href="mailto:{{.SupportEmail}}">{{.SupportEmail}}</a>.
3439
</p>
40+
{{end}}
3541
<button id="confirm-flagship-submit" class="btn btn-primary btn-md-lg w-100 my-3 mt-md-5" type="submit">
3642
{{t "Authorize Confirm Flagship Confirm"}}
3743
</button>

‎assets/templates/error.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ <h1 class="h4 h2-md mb-3 text-center">{{if .ErrorTitle}}{{t .ErrorTitle}}{{else}
5151
</div>
5252

5353
<footer>
54-
{{if .SupportEmail}}
54+
{{if .SupportPageURL}}
55+
<p class="text-center mb-3">
56+
{{t "Error Learn more" }} <a href="{{.SupportPageURL}}">{{.SupportPageURL}}</a>.
57+
</p>
58+
{{else if .SupportEmail}}
5559
<p class="text-center mb-3">
5660
{{t "Error Contact us" }} <a href="mailto:{{.SupportEmail}}">{{.SupportEmail}}</a>.
5761
</p>

0 commit comments

Comments
 (0)