From 6b711536a727010322e14dd60b3549849095f22b Mon Sep 17 00:00:00 2001 From: "severoiuliano@gmail.com" Date: Tue, 21 Jul 2020 20:46:38 +0200 Subject: [PATCH 1/4] i18n: round brackets not replaced --- system/author/js/vue-meta.js | 2 +- system/author/languages/de.yaml | 6 +++--- system/author/languages/en.yaml | 8 ++++---- system/author/languages/fr.yaml | 4 ++-- system/author/languages/it.yaml | 8 ++++---- system/author/languages/nl.yaml | 6 +++--- system/author/languages/ru.yaml | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/system/author/js/vue-meta.js b/system/author/js/vue-meta.js index 225a302..bbfeb1e 100644 --- a/system/author/js/vue-meta.js +++ b/system/author/js/vue-meta.js @@ -2,7 +2,7 @@ const FormBus = new Vue(); Vue.filter('translate', function (value) { if (!value) return '' - transvalue = value.replace(/[ ]/g,"_").replace(/[.]/g, "_").replace(/[,]/g, "_").replace(/[-]/g, "_").replace(/[,]/g,"_").replace(/[(]/g,"_").replace(/[)]/g,"_").toUpperCase() + transvalue = value.replace(/[ ]/g,"_").replace(/[.]/g, "_").replace(/[,]/g, "_").replace(/[-]/g, "_").replace(/[,]/g,"_").toUpperCase() translated_string = labels[transvalue] if(!translated_string || translated_string.length === 0){ return value diff --git a/system/author/languages/de.yaml b/system/author/languages/de.yaml index cc6c258..6a1eed3 100644 --- a/system/author/languages/de.yaml +++ b/system/author/languages/de.yaml @@ -34,8 +34,8 @@ CODE: Code COG: Einstellungen CONTENT: Inhalt COPYRIGHT: Copyright -CREATED_AT__READ_ONLY_: Erstellt am (nur lesen) -CREATED_AT__READONLY_: Erstellt am (nur lesen) +CREATED_AT_(READ_ONLY): Erstellt am (nur lesen) +CREATED_AT_(READONLY): Erstellt am (nur lesen) CREATE_NEW_USER: + Neuen Nutzer CREATE_USER: + Nutzer CROSS: Kreuz @@ -91,7 +91,7 @@ ITALIC: kursiv LANGUAGE: Language LANGUAGE_ADMIN: Sprache (Admin-UI) LANGUAGE_ATTR: Sprach-Attribut (website) -LAST_MODIFIED_LIVE__READONLY_: Live zuletzt geändert (nur lesen) +LAST_MODIFIED_LIVE_(READONLY): Live zuletzt geändert (nur lesen) LAST_NAME: Zuname LEFT: Links LICENCE: Lizenz diff --git a/system/author/languages/en.yaml b/system/author/languages/en.yaml index 6d3b373..0a4c8a5 100644 --- a/system/author/languages/en.yaml +++ b/system/author/languages/en.yaml @@ -36,8 +36,8 @@ COG: cog CONTENT: Content CONTENT: Content COPYRIGHT: Copyright -CREATED_AT__READ_ONLY_: Created at (readonly) -CREATED_AT__READONLY_: Created at (read only) +CREATED_AT_(READ_ONLY): Created at (readonly) +CREATED_AT_(READONLY): Created at (read only) CREATE_NEW_USER: Create New User CREATE_USER: Create User CROSS: cross @@ -89,13 +89,13 @@ HR: hr IF_NOT_FILLED__THE_DESCRIPTION_IS_EXTRACTED_FROM_CONTENT_: If not filled, the description is extracted from content. IMAGE: Image IMAGES: Images -IMAGE_URL__READ_ONLY_: Image URL (read only) +IMAGE_URL_(READ_ONLY): Image URL (read only) ITALIAN: Italian ITALIC: italic LANGUAGE: Language LANGUAGE_ADMIN: Language (admin-ui) LANGUAGE_ATTR: Language Attribute (website) -LAST_MODIFIED_LIVE__READONLY_: Last modified live (readonly) +LAST_MODIFIED_LIVE_(READONLY): Last modified live (readonly) LAST_NAME: Last Name LEFT: Left LICENCE: Licence diff --git a/system/author/languages/fr.yaml b/system/author/languages/fr.yaml index 201df6c..29985e7 100644 --- a/system/author/languages/fr.yaml +++ b/system/author/languages/fr.yaml @@ -34,7 +34,7 @@ CODE: Code COG: cog CONTENT: Contenu COPYRIGHT: Copyright -CREATED_AT__READ_ONLY_: Date de création (lecture seule) +CREATED_AT_(READ_ONLY): Date de création (lecture seule) CREATE_NEW_USER: Créer un nouvel utilisateur CREATE_USER: Créer un utilisateur CROSS: croix @@ -90,7 +90,7 @@ ITALIC: Italique LANGUAGE: Langue LANGUAGE_ADMIN: Langue de l'interface d'administration LANGUAGE_ATTR: Langue du site (website) -LAST_MODIFIED_LIVE__READONLY_: Dernière modification (lecture seule) +LAST_MODIFIED_LIVE_(READONLY): Dernière modification (lecture seule) LAST_NAME: Prénom LEFT: Gauche LICENCE: Licence diff --git a/system/author/languages/it.yaml b/system/author/languages/it.yaml index 7375004..d760a96 100644 --- a/system/author/languages/it.yaml +++ b/system/author/languages/it.yaml @@ -36,8 +36,8 @@ COG: ingranaggio CONTENT: Contenuto CONTENT: Contenuto COPYRIGHT: Diritti d'autore -CREATED_AT__READ_ONLY_: Creato il (sola lettura) -CREATED_AT__READONLY_: Creato il (sola lettura) +CREATED_AT_(READ_ONLY): Creato il (sola lettura) +CREATED_AT_(READONLY): Creato il (sola lettura) CREATE_NEW_USER: Crea nuovo utente CREATE_USER: Crea utente CROSS: croce @@ -89,13 +89,13 @@ HR: Linea orizzontale IF_NOT_FILLED__THE_DESCRIPTION_IS_EXTRACTED_FROM_CONTENT_: Se non compilato, la descrizione viene estratta dal contenuto. IMAGE: Immagine IMAGES: Immagini -IMAGE_URL__READ_ONLY_: Immagine URL (sola lettura) +IMAGE_URL_(READ_ONLY): URL immagine (sola lettura) ITALIAN: Italiano ITALIC: corsivo LANGUAGE: Lingua LANGUAGE_ADMIN: Lingua (admin-ui) LANGUAGE_ATTR: Attributo Lingua (sito) -LAST_MODIFIED_LIVE__READONLY_: Ultima modifica (sola lettura) +LAST_MODIFIED_LIVE_(READONLY): Ultima modifica (sola lettura) LAST_NAME: Cognome LEFT: Sinistra LICENCE: Licenza diff --git a/system/author/languages/nl.yaml b/system/author/languages/nl.yaml index a2ac48f..8e944c3 100644 --- a/system/author/languages/nl.yaml +++ b/system/author/languages/nl.yaml @@ -31,8 +31,8 @@ CODE: Code COG: tandwiel CONTENT: Inhoud COPYRIGHT: Auteursrecht -CREATED_AT__READ_ONLY_: Gemaakt om (alleen lezen) -CREATED_AT__READONLY_: Gemaakt om (alleen lezen) +CREATED_AT_(READ_ONLY): Gemaakt om (alleen lezen) +CREATED_AT_(READONLY): Gemaakt om (alleen lezen) CREATE_NEW_USER: Nieuwe gebruiker maken CREATE_USER: Gebruiker maken CROSS: kruis @@ -75,7 +75,7 @@ ITALIC: cursief LANGUAGE: Taal LANGUAGE_ADMIN: Taal (admin-ui) LANGUAGE_ATTR: Language Attribute (website) -LAST_MODIFIED_LIVE__READONLY_: Laatst gewijzigd live (alleen-lezen) +LAST_MODIFIED_LIVE_(READONLY): Laatst gewijzigd live (alleen-lezen) LAST_NAME: achternaam LEFT: Links LICENCE: Licentie diff --git a/system/author/languages/ru.yaml b/system/author/languages/ru.yaml index 5a488cc..f8ce84e 100644 --- a/system/author/languages/ru.yaml +++ b/system/author/languages/ru.yaml @@ -36,8 +36,8 @@ COG: cog CONTENT: Редактор CONTENT: Контент COPYRIGHT: Копирайт -CREATED_AT__READ_ONLY_: Создано в (только просмотр) -CREATED_AT__READONLY_: Создано в (только просмотр) +CREATED_AT_(READ_ONLY): Создано в (только просмотр) +CREATED_AT_(READONLY): Создано в (только просмотр) CREATE_NEW_USER: Создание нового пользователя CREATE_USER: Создать пользователя CROSS: Зачёркнутый @@ -83,7 +83,7 @@ ITALIC: Наклонный LANGUAGE: Язык LANGUAGE_ADMIN: Язык (admin-ui) LANGUAGE_ATTR: Language Attribute (website) -LAST_MODIFIED_LIVE__READONLY_: Последнее изменение (только просмотр) +LAST_MODIFIED_LIVE_(READONLY): Последнее изменение (только просмотр) LAST_NAME: Фамилия LEFT: Слева LICENCE: Лицензия From 2ecd173d0c7d78f61cd5e764626498d17f781637 Mon Sep 17 00:00:00 2001 From: "severoiuliano@gmail.com" Date: Tue, 21 Jul 2020 20:53:52 +0200 Subject: [PATCH 2/4] i18n: new translations for roles and rights --- system/author/languages/en.yaml | 13 +++++++++++++ system/author/languages/it.yaml | 17 +++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/system/author/languages/en.yaml b/system/author/languages/en.yaml index 0a4c8a5..466252c 100644 --- a/system/author/languages/en.yaml +++ b/system/author/languages/en.yaml @@ -13,16 +13,20 @@ ADD_LEFT_COLUMN: add left column ADD_RIGHT_COLUMN: add right column ADD_ROW_ABOVE: add row above ADD_ROW_BELOW: add row below +ADMINISTRATOR: administrator +ALL: all ALL_USERS: All users ALT_TEXT: Alt-Text ALTERNATIVE_TEXT_FOR_THE_HERO_IMAGE: Alternative Text for the hero image AUTHOR: Author +AUTHOR_DESCRIPTION_(MARKDOWN): Author-Description (Markdown) BACK_TO_STARTPAGE: back to startpage BOLD: bold BOTTOM: Bottom BROWSE: BROWSE BULLET_LIST: Bullet List BY: by +CAN_BE_USED_FOR_AUTHOR_LINE_IN_FRONTEND_: Can be used for author line in frontend. CANCEL: cancel CAPTION: Caption CELL: cell @@ -61,6 +65,7 @@ DRAFT: Draft DRAG_A_PICTURE_OR_CLICK_TO_SELECT: upload an image DUTCH__FLEMISH: Dutch, Flemish EDIT: edit +EDITOR: editor EDIT_USER: Edit User E_G_: e.g. E_MAIL: E-Mail @@ -76,6 +81,7 @@ FORMAT: Format GENERAL_PRESENTATION: General Presentation GERMAN: German GOOGLE_SITEMAP: Google Sitemap +HAS_EDIT_RIGHTS_FOR_THIS_ARTICLE_: Has edit rights for this article. HEAD: Head HEADLINE_ANCHORS: Headline Anchors HEADLINE: Headline @@ -89,6 +95,7 @@ HR: hr IF_NOT_FILLED__THE_DESCRIPTION_IS_EXTRACTED_FROM_CONTENT_: If not filled, the description is extracted from content. IMAGE: Image IMAGES: Images +IMAGE_URL: Image URL IMAGE_URL_(READ_ONLY): Image URL (read only) ITALIAN: Italian ITALIC: italic @@ -107,6 +114,7 @@ LOGOUT: Logout MANUAL_DATE: Manual date MARKDOWN: markdown MAXIMUM_SIZE_FOR_AN_IMAGE_IS_5_MB__HERO_IMAGES_ARE_NOT_SUPPORTED_BY_ALL_THEMES_: Maximum size for an image is 5 MB. Hero images are not supported by all themes. +MEMBER: member MENU: Menu META_DESCRIPTION: Meta description META: meta @@ -125,6 +133,7 @@ NUMBERED_LIST: Numbered List OLIST: olist ONLINE: online ONLY_THE_FOLLOWING_SPECIAL_CHARACTERS_ARE_ALLOWED: Only the following special characters are allowed: +OWNER_(USERNAME): owner (username) PARAGRAPH: Paragraph PASSWORD: Password PLEASE_CONFIRM: Please confirm @@ -132,6 +141,7 @@ PLEASE_CORRECT_THE_ERRORS_ABOVE: Please correct the errors above PLUGINS: Plugins PLUGIN_STORE: Plugin Store POWER_OFF: power-off +PROFILE_IMAGE: Profile-Image PUBLISH: Publish QUOTE: Quote QUOTES: Quote @@ -140,6 +150,7 @@ RAW_MARKDOWN_EDITOR: Raw Markdown Editor RAW_MODE: raw mode RAW: raw READONLY: Readonly +REGISTERED_USERS_ONLY: registered users only REMEMBER_TO_BOOKMARK_THIS_PAGE: Remember to bookmark this page REQUIRED: Required RIGHT: Right @@ -181,6 +192,7 @@ USE_A_VALID_LANGUAGE_ATTRIBUTE: Use a valid language attribute USE_A_VALID_YEAR: Use a valid year USED_AS_FALLBACK_WHEN_NO_MANUAL_DATE_IS_SET_: Used as fallback when no manual date is set. USERNAME: Username +USERNAME_(READ_ONLY): Username (read only) USERS: Users USER: User VIDEO: Video @@ -193,6 +205,7 @@ VISUAL: visual WAIT: wait WEBSITE_TITLE: Website Title WEB: Web +WEBSITE_VISIBLE_FOR: Website visible for WRITING: Writing YEAR: Year YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: You can overwrite the theme-css with your own css here. diff --git a/system/author/languages/it.yaml b/system/author/languages/it.yaml index d760a96..02da3ff 100644 --- a/system/author/languages/it.yaml +++ b/system/author/languages/it.yaml @@ -13,16 +13,20 @@ ADD_LEFT_COLUMN: aggiungi colonna a sinistra ADD_RIGHT_COLUMN: aggiungi colonna a destra ADD_ROW_ABOVE: aggiungi la riga sopra ADD_ROW_BELOW: aggiungi la riga sotto +ADMINISTRATOR: Amministratore +ALL: Tutti ALL_USERS: Tutti gli utenti ALT_TEXT: Testo alternativo ALTERNATIVE_TEXT_FOR_THE_HERO_IMAGE: Testo alternativo per l'immagine hero AUTHOR: Autore +AUTHOR_DESCRIPTION_(MARKDOWN): Descrizione dell'autore (Markdown) BACK_TO_STARTPAGE: torna alla pagina iniziale BOLD: grassetto BOTTOM: Sotto BROWSE: Sfoglia BULLET_LIST: Elenco puntato BY: di +CAN_BE_USED_FOR_AUTHOR_LINE_IN_FRONTEND_: Può essere usato per la linea autore nel sito. CANCEL: Annulla CAPTION: Didascalia CELL: cella @@ -60,7 +64,8 @@ DO_YOU_WANT_TO_DISCARD_YOUR_CHANGES_AND_SET_THE_CONTENT_BACK_TO_THE_LIVE_VERSION DRAFT: Bozza DRAG_A_PICTURE_OR_CLICK_TO_SELECT: trascina un'immagine o fai clic per selezionare DUTCH__FLEMISH: Olandese, Fiammingo -EDIT: modifica +EDIT: Modifica +EDITOR: Curatore EDIT_USER: Modifica utente E_G_: per es.: E_MAIL: Posta elettronica @@ -76,6 +81,7 @@ FORMAT: Format GENERAL_PRESENTATION: Presentazione generale GERMAN: Tedesco GOOGLE_SITEMAP: Sitemap di Google +HAS_EDIT_RIGHTS_FOR_THIS_ARTICLE_: Ha i diritti di modifica per questo articolo. HEAD: Intestazione HEADLINE_ANCHORS: Ancoraggi del titolo HEADLINE: Titolo @@ -89,6 +95,7 @@ HR: Linea orizzontale IF_NOT_FILLED__THE_DESCRIPTION_IS_EXTRACTED_FROM_CONTENT_: Se non compilato, la descrizione viene estratta dal contenuto. IMAGE: Immagine IMAGES: Immagini +IMAGE_URL: URL immagine IMAGE_URL_(READ_ONLY): URL immagine (sola lettura) ITALIAN: Italiano ITALIC: corsivo @@ -107,6 +114,7 @@ LOGOUT: Esci MANUAL_DATE: Data manuale MARKDOWN: Markdown MAXIMUM_SIZE_FOR_AN_IMAGE_IS_5_MB__HERO_IMAGES_ARE_NOT_SUPPORTED_BY_ALL_THEMES_: La dimensione massima per un'immagine è di 5 MB. Le immagini hero non sono supportate da tutti i temi. +MEMBER: Membro MENU: Menu META_DESCRIPTION: Descrizione META: Metadati @@ -125,6 +133,7 @@ NUMBERED_LIST: Elenco numerato OLIST: Elenchi ordinati ONLINE: in linea ONLY_THE_FOLLOWING_SPECIAL_CHARACTERS_ARE_ALLOWED: Sono ammessi solo i seguenti caratteri speciali: +OWNER_(USERNAME): proprietario (nome utente) PARAGRAPH: Paragrafo PASSWORD: Parola d'ordine PLEASE_CONFIRM: Per favore conferma @@ -132,6 +141,7 @@ PLEASE_CORRECT_THE_ERRORS_ABOVE: Si prega di correggere gli errori sopra PLUGINS: Plugin PLUGIN_STORE: Deposito plugin POWER_OFF: spegni +PROFILE_IMAGE: Immagine del profilo PUBLISH: Pubblica QUOTE: Citazione QUOTES: Citazione @@ -140,7 +150,8 @@ RAW: grezzo RAW_MARKDOWN_EDITOR: Editore grezzo Markdown RAW_MODE: modo grezzo READONLY: Sola lettura -REMEMBER_TO_BOOKMARK_THIS_PAGE: Ricorda di aggiungere questa pagina ai segnalibri +REGISTERED_USERS_ONLY: Solo utenti registrati +REMEMBER_TO_BOOKMARK_THIS_PAGE: Ricorda di creare un segnalibro per la pagina REQUIRED: Richiesto RIGHT: Destra ROLE: Ruolo @@ -181,6 +192,7 @@ USE_A_VALID_LANGUAGE_ATTRIBUTE: Use a valid language attribute USE_A_VALID_YEAR: Usa un anno valido USED_AS_FALLBACK_WHEN_NO_MANUAL_DATE_IS_SET_: Utilizzato come ripiego quando non è impostata alcuna data manuale. USERNAME: Nome utente +USERNAME_(READ_ONLY): Nome utente (sola lettura) USERS: Utenti USER: Utente VIDEO: Video @@ -193,6 +205,7 @@ VISUAL: visivo WAIT: aspetta WEBSITE_TITLE: Titolo del sito WEB: Sito +WEBSITE_VISIBLE_FOR: Sito visibile per WRITING: Scrittura YEAR: Anno YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: È possibile sovrascrivere il css del tema con il proprio CSS qui. From 8b06e817d5ef9276738c76c2656d1a26e95971db Mon Sep 17 00:00:00 2001 From: "severoiuliano@gmail.com" Date: Tue, 21 Jul 2020 20:56:57 +0200 Subject: [PATCH 3/4] i18n: twig file adjustment for roles and rights --- system/author/partials/fields.twig | 4 ++-- system/author/settings/userlist.twig | 10 +++++----- system/author/settings/usernew.twig | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/system/author/partials/fields.twig b/system/author/partials/fields.twig index 6238d3e..a73f2bf 100644 --- a/system/author/partials/fields.twig +++ b/system/author/partials/fields.twig @@ -18,7 +18,7 @@
{{ __('Upload an image') }}
- +
@@ -69,7 +69,7 @@ diff --git a/system/author/settings/userlist.twig b/system/author/settings/userlist.twig index 3344337..8ec6be3 100644 --- a/system/author/settings/userlist.twig +++ b/system/author/settings/userlist.twig @@ -14,10 +14,10 @@
    • -
    • Username -
    • Role -
    • Edit
      • +
    • {{ __('Username') }}
      • +
    • {{ __('Role') }}
      • + +
    • {{ __('Edit') }}
    • {% for user in userdata %} @@ -25,7 +25,7 @@
    • {{ user.username }} -
    • {{ user.userrole }} +
    • {{ __(user.userrole) }}
    • {{ __('edit') }}
    diff --git a/system/author/settings/usernew.twig b/system/author/settings/usernew.twig index 4bd186c..23c90c7 100644 --- a/system/author/settings/usernew.twig +++ b/system/author/settings/usernew.twig @@ -27,7 +27,7 @@ {% if errors.userrole %} From 5f9fb5835bd6fd3fb5167a2037edfd0c76029ea0 Mon Sep 17 00:00:00 2001 From: "severoiuliano@gmail.com" Date: Fri, 7 Aug 2020 15:44:21 +0200 Subject: [PATCH 4/4] Updated French and German translations --- system/author/languages/de.yaml | 2 +- system/author/languages/fr.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/author/languages/de.yaml b/system/author/languages/de.yaml index 6a1eed3..9c2e61c 100644 --- a/system/author/languages/de.yaml +++ b/system/author/languages/de.yaml @@ -195,7 +195,7 @@ YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: Du kannst das CSS des T SETUP_WELCOME: Setup Willkommen HURRA: Hurra YOUR_ACCOUNT_HAS_BEEN_CREATED_AND_YOU_ARE_LOGGED_IN_NOW_: Dein Account wurde erstellt und du bist jetzt angemeldet. -NEXT_STEP: Nächster Schritt: +NEXT_STEP: Nächster Schritt VISIT_THE_AUTHOR_PANEL_AND_SETUP_YOUR_NEW_WEBSITE__YOU_CAN_CONFIGURE_THE_SYSTEM__CHOOSE_THEMES_AND_ADD_PLUGINS_: Besuche die Autorenoberfläche und richte die Seite ein. Du kannst das System konfigurieren, Themes auswählen and Plugins hinzufügen. GET_HELP: Hilfe erhalten IF_YOU_HAVE_ANY_QUESTIONS__PLEASE_READ_THE: Wenn du Fragen hast, lies bitte die diff --git a/system/author/languages/fr.yaml b/system/author/languages/fr.yaml index 29985e7..ba9a5a1 100644 --- a/system/author/languages/fr.yaml +++ b/system/author/languages/fr.yaml @@ -192,9 +192,9 @@ YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: Vous pouvez surcharger SETUP_WELCOME: Bienvenue dans l'installation HURRA: Hourrah YOUR_ACCOUNT_HAS_BEEN_CREATED_AND_YOU_ARE_LOGGED_IN_NOW_: Votre compte a été créé et vous êtes maintenant connecté -NEXT_STEP: Prochaine étape: +NEXT_STEP: Prochaine étape VISIT_THE_AUTHOR_PANEL_AND_SETUP_YOUR_NEW_WEBSITE__YOU_CAN_CONFIGURE_THE_SYSTEM__CHOOSE_THEMES_AND_ADD_PLUGINS_: Visitez le volet Auteur et configurez votre nouveau site. Vous pouvez paramétrer le système, choisir un thème et ajouter des plugins. -GET_HELP: Obtenir de l'aide: +GET_HELP: Obtenir de l'aide IF_YOU_HAVE_ANY_QUESTIONS__PLEASE_READ_THE: Pour toutes questions, veuillez consulter la DOCS: documentation OR_OPEN_A_NEW_ISSUE_ON: ou ouvrir un nouveau bug sur