From 7e4e0dd1e7e44a93077251e7fb329dec3ad050c1 Mon Sep 17 00:00:00 2001 From: viktorstrate Date: Mon, 19 Apr 2021 19:09:40 +0200 Subject: [PATCH] Integrate polish translation --- api/graphql/generated.go | 1 + api/graphql/models/generated.go | 4 +++- api/graphql/schema.graphql | 1 + ui/__generated__/globalTypes.ts | 1 + ui/babel.config.js | 2 +- ui/extractedTranslations/da/translation.json | 1 + ui/extractedTranslations/en/translation.json | 1 + ui/extractedTranslations/es/translation.json | 2 ++ ui/extractedTranslations/fr/translation.json | 1 + ui/extractedTranslations/it/translation.json | 2 ++ ui/extractedTranslations/pl/translation.json | 4 ++++ ui/extractedTranslations/sv/translation.json | 1 + ui/src/Pages/LoginPage/LoginPage.tsx | 4 ++++ ui/src/Pages/SettingsPage/UserPreferences.tsx | 2 ++ ui/src/localization.ts | 14 ++++++++++---- 15 files changed, 35 insertions(+), 6 deletions(-) diff --git a/api/graphql/generated.go b/api/graphql/generated.go index 0ba109ab..7c02b830 100644 --- a/api/graphql/generated.go +++ b/api/graphql/generated.go @@ -1848,6 +1848,7 @@ enum LanguageTranslation { Swedish, Danish, Spanish, + Polish, } type UserPreferences { diff --git a/api/graphql/models/generated.go b/api/graphql/models/generated.go index f92e53bb..79c81d3f 100644 --- a/api/graphql/models/generated.go +++ b/api/graphql/models/generated.go @@ -77,6 +77,7 @@ const ( LanguageTranslationSwedish LanguageTranslation = "Swedish" LanguageTranslationDanish LanguageTranslation = "Danish" LanguageTranslationSpanish LanguageTranslation = "Spanish" + LanguageTranslationPolish LanguageTranslation = "Polish" ) var AllLanguageTranslation = []LanguageTranslation{ @@ -86,11 +87,12 @@ var AllLanguageTranslation = []LanguageTranslation{ LanguageTranslationSwedish, LanguageTranslationDanish, LanguageTranslationSpanish, + LanguageTranslationPolish, } func (e LanguageTranslation) IsValid() bool { switch e { - case LanguageTranslationEnglish, LanguageTranslationFrench, LanguageTranslationItalian, LanguageTranslationSwedish, LanguageTranslationDanish, LanguageTranslationSpanish: + case LanguageTranslationEnglish, LanguageTranslationFrench, LanguageTranslationItalian, LanguageTranslationSwedish, LanguageTranslationDanish, LanguageTranslationSpanish, LanguageTranslationPolish: return true } return false diff --git a/api/graphql/schema.graphql b/api/graphql/schema.graphql index 0c34f0b6..86686ff6 100644 --- a/api/graphql/schema.graphql +++ b/api/graphql/schema.graphql @@ -228,6 +228,7 @@ enum LanguageTranslation { Swedish, Danish, Spanish, + Polish, } type UserPreferences { diff --git a/ui/__generated__/globalTypes.ts b/ui/__generated__/globalTypes.ts index 43bf024f..3d05a575 100644 --- a/ui/__generated__/globalTypes.ts +++ b/ui/__generated__/globalTypes.ts @@ -12,6 +12,7 @@ export enum LanguageTranslation { English = 'English', French = 'French', Italian = 'Italian', + Polish = 'Polish', Spanish = 'Spanish', Swedish = 'Swedish', } diff --git a/ui/babel.config.js b/ui/babel.config.js index 80ce92a3..a1f44813 100644 --- a/ui/babel.config.js +++ b/ui/babel.config.js @@ -13,7 +13,7 @@ module.exports = function (api) { plugins.push([ 'i18next-extract', { - locales: ['en', 'da', 'fr', 'sv'], + locales: ['en', 'da', 'fr', 'sv', 'es', 'it', 'pl'], defaultValue: null, }, ]) diff --git a/ui/extractedTranslations/da/translation.json b/ui/extractedTranslations/da/translation.json index 1f46bd61..ae0d5691 100644 --- a/ui/extractedTranslations/da/translation.json +++ b/ui/extractedTranslations/da/translation.json @@ -247,6 +247,7 @@ }, "title": { "loading_album": "Loader album", + "login": null, "people": "Personer", "settings": "Indstillinger" } diff --git a/ui/extractedTranslations/en/translation.json b/ui/extractedTranslations/en/translation.json index 418843d2..1fcff5c1 100644 --- a/ui/extractedTranslations/en/translation.json +++ b/ui/extractedTranslations/en/translation.json @@ -247,6 +247,7 @@ }, "title": { "loading_album": "Loading album", + "login": "Login", "people": "People", "settings": "Settings" } diff --git a/ui/extractedTranslations/es/translation.json b/ui/extractedTranslations/es/translation.json index af2c7557..90e14689 100644 --- a/ui/extractedTranslations/es/translation.json +++ b/ui/extractedTranslations/es/translation.json @@ -17,6 +17,7 @@ "add": "Añadir", "cancel": "Cancelar", "delete": "Eliminar", + "more": null, "remove": "Borrar", "save": "Guardar" }, @@ -246,6 +247,7 @@ }, "title": { "loading_album": "Cargando álbum", + "login": null, "people": "Personas", "settings": "Opciones" } diff --git a/ui/extractedTranslations/fr/translation.json b/ui/extractedTranslations/fr/translation.json index 94d9d225..fe52f976 100644 --- a/ui/extractedTranslations/fr/translation.json +++ b/ui/extractedTranslations/fr/translation.json @@ -247,6 +247,7 @@ }, "title": { "loading_album": "Chargement de l'album", + "login": null, "people": "Personnes", "settings": "Paramètres" } diff --git a/ui/extractedTranslations/it/translation.json b/ui/extractedTranslations/it/translation.json index 5573643b..8e327609 100644 --- a/ui/extractedTranslations/it/translation.json +++ b/ui/extractedTranslations/it/translation.json @@ -17,6 +17,7 @@ "add": "Aggiungi", "cancel": "Cancella", "delete": "Elimina", + "more": null, "remove": "Rimuovi", "save": "Salva" }, @@ -246,6 +247,7 @@ }, "title": { "loading_album": "Caricamento album", + "login": null, "people": "Persone", "settings": "Impostazioni" } diff --git a/ui/extractedTranslations/pl/translation.json b/ui/extractedTranslations/pl/translation.json index cc67eb61..23f43e30 100644 --- a/ui/extractedTranslations/pl/translation.json +++ b/ui/extractedTranslations/pl/translation.json @@ -175,6 +175,9 @@ "download": { "filesize": { "byte": "{{count}} Bajt", + "byte_0": null, + "byte_1": null, + "byte_2": null, "byte_plural": "{{count}} Bajtów", "giga_byte": "{{count}} GB", "kilo_byte": "{{count}} KB", @@ -247,6 +250,7 @@ }, "title": { "loading_album": "Ładowanie albumu", + "login": null, "people": "Ludzie", "settings": "Ustawienia" } diff --git a/ui/extractedTranslations/sv/translation.json b/ui/extractedTranslations/sv/translation.json index dd8bbee5..6b9e553a 100644 --- a/ui/extractedTranslations/sv/translation.json +++ b/ui/extractedTranslations/sv/translation.json @@ -247,6 +247,7 @@ }, "title": { "loading_album": "Laddar album", + "login": null, "people": "Personer", "settings": "Inställningar" } diff --git a/ui/src/Pages/LoginPage/LoginPage.tsx b/ui/src/Pages/LoginPage/LoginPage.tsx index 389f1826..f61c847a 100644 --- a/ui/src/Pages/LoginPage/LoginPage.tsx +++ b/ui/src/Pages/LoginPage/LoginPage.tsx @@ -8,6 +8,7 @@ import { authToken } from '../../helpers/authentication' import logoPath from '../../assets/photoview-logo.svg' import { useTranslation } from 'react-i18next' +import { Helmet } from 'react-helmet' const authorizeMutation = gql` mutation Authorize($username: String!, $password: String!) { @@ -96,6 +97,9 @@ const LoginPage = () => { return (
+ + {t('title.login', 'Login')} - Photoview + {initialSetupData?.siteInfo?.initialSetup && ( diff --git a/ui/src/Pages/SettingsPage/UserPreferences.tsx b/ui/src/Pages/SettingsPage/UserPreferences.tsx index d5398d0d..d7caccca 100644 --- a/ui/src/Pages/SettingsPage/UserPreferences.tsx +++ b/ui/src/Pages/SettingsPage/UserPreferences.tsx @@ -22,6 +22,8 @@ const languagePreferences = [ { key: 3, text: 'Svenska', flag: 'se', value: LanguageTranslation.Swedish }, { key: 4, text: 'Dansk', flag: 'dk', value: LanguageTranslation.Danish }, { key: 5, text: 'Español', flag: 'es', value: LanguageTranslation.Spanish }, + { key: 6, text: 'polski', flag: 'pl', value: LanguageTranslation.Polish }, + { key: 7, text: 'Italiano', flag: 'it', value: LanguageTranslation.Italian }, ] const CHANGE_USER_PREFERENCES = gql` diff --git a/ui/src/localization.ts b/ui/src/localization.ts index ac114bf4..4f6cba06 100644 --- a/ui/src/localization.ts +++ b/ui/src/localization.ts @@ -83,17 +83,23 @@ export const loadTranslations = () => { }) return case LanguageTranslation.Italian: - import('../extractedTranslations/it/translation.json').then(swedish => { - i18n.addResourceBundle('it', 'translation', swedish) + import('../extractedTranslations/it/translation.json').then(italian => { + i18n.addResourceBundle('it', 'translation', italian) i18n.changeLanguage('it') }) return case LanguageTranslation.Spanish: - import('../extractedTranslations/es/translation.json').then(swedish => { - i18n.addResourceBundle('es', 'translation', swedish) + import('../extractedTranslations/es/translation.json').then(spanish => { + i18n.addResourceBundle('es', 'translation', spanish) i18n.changeLanguage('es') }) return + case LanguageTranslation.Polish: + import('../extractedTranslations/pl/translation.json').then(polish => { + i18n.addResourceBundle('pl', 'translation', polish) + i18n.changeLanguage('pl') + }) + return } exhaustiveCheck(language)