From 4ce405a8bf94310eab678b08a4fa1c7fea427920 Mon Sep 17 00:00:00 2001
From: 4gray <4gray@users.noreply.github.com>
Date: Wed, 15 Feb 2023 23:32:27 +0100
Subject: [PATCH 1/2] refactor(settings): extract hardcoded text to i18n string
 this commit is related to GUI translation issues #226

---
 .../home/url-upload/url-upload.component.html    |  2 +-
 .../about-dialog/about-dialog.component.ts       | 16 +++++++++-------
 src/assets/i18n/en.json                          |  8 ++++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/app/home/url-upload/url-upload.component.html b/src/app/home/url-upload/url-upload.component.html
index ca45dfe2f..08efd5e67 100644
--- a/src/app/home/url-upload/url-upload.component.html
+++ b/src/app/home/url-upload/url-upload.component.html
@@ -8,7 +8,7 @@
         />
     </mat-form-field>
     <mat-card *ngIf="!isElectron">
-        Note: In order to avoid <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS" target="_blank">CORS</a> issues at this point the application uses a public CORS Proxy service. If you want to upload a playlist with sensitive data, it is better to import it as a file in the adjacent tab.
+        {{ 'HOME.URL_UPLOAD.CORS_NOTE' | translate }}
     </mat-card>
     <button
         class="add-button"
diff --git a/src/app/shared/components/about-dialog/about-dialog.component.ts b/src/app/shared/components/about-dialog/about-dialog.component.ts
index f89579579..b88299a04 100644
--- a/src/app/shared/components/about-dialog/about-dialog.component.ts
+++ b/src/app/shared/components/about-dialog/about-dialog.component.ts
@@ -16,27 +16,29 @@ import { TranslateModule } from '@ngx-translate/core';
                 <a
                     href="https://github.com/4gray/iptvnator"
                     target="_blank"
-                    title="ITPVnator repository on GitHub"
-                    aria-label="ITPVnator repository on GitHub"
+                    [title]="'ABOUT.GITHUB_TOOLTIP' | translate"
+                    [attr.aria-label]="'ABOUT.GITHUB_TOOLTIP' | translate"
                     ><img
                         src="./assets/icons/github-light.png"
-                        title="ITPVnator repository on GitHub" /></a
+                        [title]="'ABOUT.GITHUB_TOOLTIP' | translate" /></a
                 >&nbsp;
                 <a
                     href="http://twitter.com/share?text=IPTVnator &mdash; free cross-platform IPTV player. Available as PWA and as native application.&url=https://github.com/4gray/iptvnator&hashtags=iptv,m3u,video-player"
-                    title="Share on Twitter"
+                    [title]="'ABOUT.TWITTER_TOOLTIP' | translate"
                 >
                     <img
                         height="32"
                         src="./assets/icons/twitter-light.png"
-                        title="Share on Twitter"
+                        [title]="'ABOUT.TWITTER_TOOLTIP' | translate"
                     />
                 </a>
                 <a
                     href="https://www.buymeacoffee.com/4gray"
                     target="_blank"
-                    title="Buy me a coffee"
-                    aria-label="Buy me a coffee"
+                    [title]="'ABOUT.BUY_ME_A_COFFEE_TOOLTIP' | translate"
+                    [attr.aria-label]="
+                        'ABOUT.BUY_ME_A_COFFEE_TOOLTIP' | translate
+                    "
                     ><mat-icon>local_cafe</mat-icon></a
                 >
             </p>
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index da593a328..ebef663d5 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -52,7 +52,8 @@
         },
         "URL_UPLOAD": {
             "PLAYLIST_URL": "Playlist URL (m3u, m3u8)",
-            "ADD_PLAYLIST": "Add playlist"
+            "ADD_PLAYLIST": "Add playlist",
+            "CORS_NOTE": "Note: In order to avoid CORS issues at this point the application uses a public CORS Proxy service. If you want to upload a playlist with sensitive data, it is better to import it as a file in the adjacent tab."
         },
         "TEXT_IMPORT": {
             "LABEL": "Insert m3u(8) playlist as text",
@@ -156,7 +157,10 @@
     "ABOUT": {
         "TITLE": "About IPTVnator",
         "DESCRIPTION": "Cross-platform IPTV player application with multiple features, such as support of m3u and m3u8 playlists, favorites, TV guide, TV archive/catchup and more.",
-        "VERSION": "Version"
+        "VERSION": "Version",
+        "GITHUB_TOOLTIP": "ITPVnator repository on GitHub",
+        "BUY_ME_A_COFFEE_TOOLTIP": "Buy me a coffee",
+        "TWITTER_TOOLTIP": "Share on Twitter"
     },
     "UPDATE_AVAILABLE": "Update available",
     "REFRESH": "Refresh"

From a1bfaebe65ce8ffdd0b16d267eb57de1d255a36e Mon Sep 17 00:00:00 2001
From: bovirus <1262554+bovirus@users.noreply.github.com>
Date: Thu, 16 Feb 2023 10:21:10 +0100
Subject: [PATCH 2/2] Update italian language

---
 src/assets/i18n/it.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index eb580d9e5..717d58674 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -52,7 +52,8 @@
         },
         "URL_UPLOAD": {
             "PLAYLIST_URL": "URL playlist (m3u, m3u8)",
-            "ADD_PLAYLIST": "Aggiungi playlist"
+            "ADD_PLAYLIST": "Aggiungi playlist",
+            "CORS_NOTE": "Nota: per evitare problemi CORS a questo punto, l'applicazione usa un servizio proxy CORS pubblico. Se vuoi caricare una playlist con dati sensibili, è meglio importarla come file nella scheda adiacente."
         },
         "TEXT_IMPORT": {
             "LABEL": "Inserisci playlist m3u(8) come testo",
@@ -86,7 +87,6 @@
         "VERSION_DESCRIPTION": "Versione attuale dell'applicazione",
         "EPG_NOTE": "Attualmente EPG è disponibile solo nella versione dell'applicazione electron.",
         "EPG_NOTE_URL_TEXT": "Maggiori info qui"
-
     },
     "THEMES": {
         "DARK_THEME": "Tema scuro",
@@ -157,7 +157,10 @@
     "ABOUT": {
         "TITLE": "Info su IPTVnator",
         "DESCRIPTION": "Applicazione per la riproduzione IPTV multi piattaforma con molteplici funzionalità, come il supporto di playlist m3u e m3u8, preferiti, guida TV, archivio TV/catchup e altro ancora.",
-        "VERSION": "Versione"
+        "VERSION": "Versione",
+        "GITHUB_TOOLTIP": "Repository ITPVnator su GitHub",
+        "BUY_ME_A_COFFEE_TOOLTIP": "Offrimi un caffè",
+        "TWITTER_TOOLTIP": "Condividi su Twitter"
     },
     "UPDATE_AVAILABLE": "Disponibile aggiornamento",
     "REFRESH": "Aggiorna"