From 73dc17ae28cd16a1f1c5f9933779c559ea6ce329 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 21 Apr 2018 19:20:02 +0200 Subject: Added some translations - including Klingon! --- .../sprinkles/core/assets/SiteAssets/css/main.css | 23 ++-- .../core/assets/SiteAssets/languages/ExcelFile.xls | Bin 52736 -> 0 bytes .../SiteAssets/languages/json/Translations.json | 50 --------- .../core/assets/SiteAssets/languages/json/de.json | 14 --- .../core/assets/SiteAssets/languages/json/en.json | 14 --- .../core/assets/SiteAssets/languages/json/fr.json | 14 --- .../core/assets/SiteAssets/languages/json/kl.json | 14 --- main/app/sprinkles/core/config/default.php | 1 + main/app/sprinkles/core/locale/de_DE/main.php | 4 +- main/app/sprinkles/core/locale/en_US/main.php | 4 +- main/app/sprinkles/core/locale/fr_FR/main.php | 4 +- main/app/sprinkles/core/locale/tlh/errors.php | 53 +++++++++ main/app/sprinkles/core/locale/tlh/main.php | 17 +++ main/app/sprinkles/core/locale/tlh/messages.php | 123 +++++++++++++++++++++ main/app/sprinkles/core/locale/tlh/validate.php | 32 ++++++ .../sprinkles/core/templates/pages/index.html.twig | 41 ++++--- 16 files changed, 272 insertions(+), 136 deletions(-) delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json create mode 100644 main/app/sprinkles/core/locale/tlh/errors.php create mode 100644 main/app/sprinkles/core/locale/tlh/main.php create mode 100644 main/app/sprinkles/core/locale/tlh/messages.php create mode 100644 main/app/sprinkles/core/locale/tlh/validate.php (limited to 'main') diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index 3bf1b55..1f3b8c0 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -1,6 +1,8 @@ /****** GENERAL ******/ +@import url('https://fonts.googleapis.com/css?family=Nanum+Gothic'); + * { -webkit-touch-callout: none; -webkit-user-select: none; @@ -22,7 +24,7 @@ GENERAL } body { - font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; + font-family: 'Nanum Gothic', sans-serif; height: 100%; width: 100%; overflow: hidden; @@ -140,6 +142,7 @@ CHAT WINDOW word-wrap: break-word; text-align: center; padding: 10px; + font-size: 0.9em; } .ServerChatMessage { @@ -160,6 +163,13 @@ CHAT WINDOW .MessageSent { float: right; background-color: #12213b; + color: #345679; +} + +.MessageReceived { + float: left; + background-color: #13223c; + color: #f3f4f5; } .AloneMessage { @@ -186,11 +196,6 @@ CHAT WINDOW border-radius: 10px 10px 25px 25px; } -.MessageReceived { - float: left; - background-color: #13223c; -} - .ChatInput { position: absolute; box-sizing: border-box; @@ -204,14 +209,10 @@ CHAT WINDOW -webkit-border-radius: 25px; -moz-border-radius: 25px; border-radius: 25px; - color: #426A91; + color: #f3f4f5; background-color: #13223C; } -#SubscribeTextInput { - color: #FFF; -} - #ChatTextInput { display: none; } diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls b/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls deleted file mode 100644 index ffc5552..0000000 Binary files a/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls and /dev/null differ diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json deleted file mode 100644 index 3406ffb..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "en": { - "Translator": "Marvin Borner", - "you": "you", - "Feed": "New", - "Explore": "Explore", - "Chat": "Chat", - "Friends": "Friends", - "Personal": "Personal", - "joined the group": "joined the group", - "You joined the group": "You joined the group", - "has disconnected from the server": "has disconnected from the server" - }, - "de": { - "Translator": "Marvin Borner", - "you": "du", - "Feed": "Neues", - "Explore": "Entdecken", - "Chat": "Nachrichten", - "Friends": "Freunde", - "Personal": "Persönliche Daten", - "joined the group": "ist der Gruppe beigetreten", - "You joined the group": "Du bist der Gruppe beigetreten", - "has disconnected from the server": "hat sich vom Server getrennt" - }, - "fr": { - "Translator": "Marvin Borner (non-french)", - "you": "vous", - "Feed": "D'actualités", - "Explore": "Dépister", - "Chat": "Message", - "Friends": "Camarades", - "Personal": "Personnelles", - "joined the group": "s'est joint au groupe", - "You joined the group": "Vous avez rejoint le groupe", - "has disconnected from the server": "s'est déconnecté du serveur." - }, - "kl": { - "Translator": "Marvin Borner (probably needs corrections)", - "you": "SoH", - "Feed": "De'", - "Explore": "Tu'", - "Chat": "Qin", - "Friends": "Jup", - "Personal": "Ghot", - "joined the group": "ghom muv", - "You joined the group": "Ghom muv SoH", - "has disconnected from the server": "disconnected vo' jabwI'" - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json deleted file mode 100644 index 74d522a..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "de": { - "Translator": "Marvin Borner", - "you": "du", - "Feed": "Neues", - "Explore": "Entdecken", - "Chat": "Nachrichten", - "Friends": "Freunde", - "Personal": "Persönliche Daten", - "joined the group": "ist der Gruppe beigetreten", - "You joined the group": "Du bist der Gruppe beigetreten", - "has disconnected from the server": "hat sich vom Server getrennt" - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json deleted file mode 100644 index 981bb83..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "en": { - "Translator": "Marvin Borner", - "you": "you", - "Feed": "New", - "Explore": "Explore", - "Chat": "Chat", - "Friends": "Friends", - "Personal": "Personal", - "joined the group": "joined the group", - "You joined the group": "You joined the group", - "has disconnected from the server": "has disconnected from the server" - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json deleted file mode 100644 index 5c59619..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fr": { - "Translator": "Marvin Borner (non-french)", - "you": "vous", - "Feed": "D'actualités", - "Explore": "Dépister", - "Chat": "Message", - "Friends": "Camarades", - "Personal": "Personnelles", - "joined the group": "s'est joint au groupe", - "You joined the group": "Vous avez rejoint le groupe", - "has disconnected from the server": "s'est déconnecté du serveur." - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json deleted file mode 100644 index b21768e..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "kl": { - "Translator": "Marvin Borner (probably needs corrections)", - "you": "SoH", - "Feed": "De'", - "Explore": "Tu'", - "Chat": "Qin", - "Friends": "Jup", - "Personal": "Ghot", - "joined the group": "ghom muv", - "You joined the group": "Ghom muv SoH", - "has disconnected from the server": "disconnected vo' jabwI'" - } -} diff --git a/main/app/sprinkles/core/config/default.php b/main/app/sprinkles/core/config/default.php index 3478fb6..4e997d3 100644 --- a/main/app/sprinkles/core/config/default.php +++ b/main/app/sprinkles/core/config/default.php @@ -144,6 +144,7 @@ 'ar' => 'العربية', 'pt_PT' => 'Português', 'ru_RU' => 'русский', + 'tlh' => 'tlhIngan Hol', 'de_DE' => 'Deutsch', 'fr_FR' => 'Français', 'tr' => 'Türk', diff --git a/main/app/sprinkles/core/locale/de_DE/main.php b/main/app/sprinkles/core/locale/de_DE/main.php index cd9e00c..3aec435 100644 --- a/main/app/sprinkles/core/locale/de_DE/main.php +++ b/main/app/sprinkles/core/locale/de_DE/main.php @@ -10,6 +10,8 @@ return [ "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} ist der Gruppe beigetreten", "YOU_GROUP_JOIN" => "Du bist der Gruppe {{group}} beigetreten", - "USER_DISCONNECT" => "{{user}} hat sich vom Server getrennt" + "USER_DISCONNECT" => "{{user}} hat sich vom Server getrennt", + "JOIN_GROUP_PH" => "Betrete eine Gruppe...", + "WRITE_MESSAGE_PH" => "Schreibe eine Nachricht..." ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/en_US/main.php b/main/app/sprinkles/core/locale/en_US/main.php index 06585fc..9244f30 100644 --- a/main/app/sprinkles/core/locale/en_US/main.php +++ b/main/app/sprinkles/core/locale/en_US/main.php @@ -10,6 +10,8 @@ return [ "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} joined the group", "YOU_GROUP_JOIN" => "You joined the group {{group}}", - "USER_DISCONNECT" => "{{user}} has disconnected from the server" + "USER_DISCONNECT" => "{{user}} has disconnected from the server", + "JOIN_GROUP_PH" => "Join a group...", + "WRITE_MESSAGE_PH" => "Write a message..." ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/fr_FR/main.php b/main/app/sprinkles/core/locale/fr_FR/main.php index f9e2f79..bd12cf1 100644 --- a/main/app/sprinkles/core/locale/fr_FR/main.php +++ b/main/app/sprinkles/core/locale/fr_FR/main.php @@ -10,6 +10,8 @@ return [ "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} s'est joint au groupe", "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe {{group}}", - "USER_DISCONNECT" => "{{user}} s'est déconnecté du serveur" + "USER_DISCONNECT" => "{{user}} s'est déconnecté du serveur", + "JOIN_GROUP_PH" => "Rejoindre un groupe...", + "WRITE_MESSAGE_PH" => "Ecrire un message..." ] ]; diff --git a/main/app/sprinkles/core/locale/tlh/errors.php b/main/app/sprinkles/core/locale/tlh/errors.php new file mode 100644 index 0000000..cde296b --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/errors.php @@ -0,0 +1,53 @@ + [ + "@TRANSLATION" => "Fehler", + + "400" => [ + "TITLE" => "Fehler 400: Ungültige Anforderung", + "DESCRIPTION" => "Die Anfrage-Nachricht war fehlerhaft aufgebaut.", + ], + + "404" => [ + "TITLE" => "Fehler 404: Seite nicht gefunden", + "DESCRIPTION" => "Die angeforderte Ressource wurde nicht gefunden.", + "DETAIL" => "Wir haben versucht Ihre Seite zu finden ...", + "EXPLAIN" => "Die von Ihnen gesuchte Seite konnte nicht gefunden werden.", + "RETURN" => "Klicken Sie Hier, um zur Startseite zurückzukehren." + ], + + "CONFIG" => [ + "TITLE" => "UserFrosting Konfigurationsproblem!", + "DESCRIPTION" => "Einige UserFrosting-Konfigurationsanforderungen wurden nicht erfüllt.", + "DETAIL" => "Etwas stimmt hier nicht.", + "RETURN" => "Bitte beheben Sie die folgenden Fehler dann laden Sie die Website neu." + ], + + "DESCRIPTION" => "Wir haben eine große Störung in der Macht erkannt.", + "DETAIL" => "Hier haben wir:", + + "ENCOUNTERED" => "Uhhh ... etwas ist passiert. Wir wissen nicht was.", + + "MAIL" => "Schwerwiegender Fehler beim Mailversand, wenden Sie sich an Ihren Serveradministrator. Wenn Sie der Administrator sind, überprüfen Sie bitte das UF-Mail-Protokoll.", + + "RETURN" => "Klicken Sie Hier, um zur Startseite zurückzukehren.", + + "SERVER" => "Hoppla, sieht aus als hätte der Server möglicherweise gepatzt. Wenn Sie ein Administrator sind, überprüfen Sie bitte die PHP- oder UF-Fehlerprotokolle.", + + "TITLE" => "Störung in der Kraft" + ] +]; diff --git a/main/app/sprinkles/core/locale/tlh/main.php b/main/app/sprinkles/core/locale/tlh/main.php new file mode 100644 index 0000000..6f7f533 --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/main.php @@ -0,0 +1,17 @@ + [ + "FEED" => "De'", + "EXPLORE" => "Tu'", + "CHAT" => "Jaw", + "FRIENDS" => "Jup", + "PERSONAL" => "Ghot" + ], + "CHAT_MESSAGES" => [ + "USER_GROUP_JOIN" => "Ghom muv {{user}}", + "YOU_GROUP_JOIN" => "Ghom {{group}} muv SoH", + "USER_DISCONNECT" => "{{user}} chev vo' jabwI'", + "JOIN_GROUP_PH" => "Ghom muv...", + "WRITE_MESSAGE_PH" => "QIn ghItlh...", + ] +]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/tlh/messages.php b/main/app/sprinkles/core/locale/tlh/messages.php new file mode 100644 index 0000000..1af7c57 --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/messages.php @@ -0,0 +1,123 @@ + 1, + + "ABOUT" => "Über", + + "CAPTCHA" => [ + "@TRANSLATION" => "Sicherheitscode", + "FAIL" => "Sie haben den Sicherheitscode nicht korrekt eingegeben.", + "SPECIFY" => "Geben Sie den Sicherheitscode ein", + "VERIFY" => "Überprüfen Sie den Sicherheitscode" + ], + + "CSRF_MISSING" => "Fehlender CSRF-Token. Versuchen, die Seite zu aktualisieren und erneut zu senden?", + + "DB_INVALID" => "Keine Verbindung zur Datenbank möglich. Wenn Sie ein Administrator sind, überprüfen Sie bitte Ihr Fehlerprotokoll.", + "DESCRIPTION" => "Beschreibung", + "DOWNLOAD" => [ + "@TRANSLATION" => "Herunterladen", + "CSV" => "CSV herunterladen" + ], + + "EMAIL" => [ + "@TRANSLATION" => "E-Mail", + "YOUR" => "Ihre E-Mail-Adresse" + ], + + "HOME" => "Startseite", + + "LEGAL" => [ + "@TRANSLATION" => "Rechtsgrundsatz", + "DESCRIPTION" => "Unser Rechtsgrundsatz gilt für die Benutzung dieser Internetseite und unserer Dienste." + ], + + "LOCALE" => [ + "@TRANSLATION" => "Sprache" + ], + + "NAME" => "Name", + "NAVIGATION" => "Navigation", + "NO_RESULTS" => "Sorry, hier gibt es bisher nichts zu sehen.", + + "PAGINATION" => [ + "GOTO" => "Gehe zu Seite", + "SHOW" => "Anzeigen", + + // Paginator + // possible variables: {size}, {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows} + // also {page:input} & {startRow:input} will add a modifiable input in place of the value + "OUTPUT" => "{startRow} bis {endRow} von {filteredRows} ({totalRows})", + + "NEXT" => "Nächste Seite", + "PREVIOUS" => "Vorherige Seite", + "FIRST" => "Erste Seite", + "LAST" => "Letzte Seite" + ], + "PRIVACY" => [ + "@TRANSLATION" => "Datenschutzbestimmungen", + "DESCRIPTION" => "In unsere Datenschutzbestimmungen erklären wir Ihnen, welche Daten wir sammeln und wozu wir diese benutzen." + ], + + "SLUG" => "Abkürzung", + "SLUG_CONDITION" => "Abkürzung/Bedingungen", + "SLUG_IN_USE" => "Die Abkürzung {{slug}} existiert bereits", + "STATUS" => "Status", + "SUGGEST" => "Vorschlagen", + + "UNKNOWN" => "Unbekannt", + + // Actions words + "ACTIONS" => "Aktionen", + "ACTIVATE" => "Aktivieren", + "ACTIVE" => "Aktiv", + "ADD" => "Hinzufügen", + "CANCEL" => "Abbrechen", + "CONFIRM" => "Bestätigen", + "CREATE" => "Erstellen", + "DELETE" => "Löschen", + "DELETE_CONFIRM" => "Möchten Sie diese wirklich löschen?", + "DELETE_CONFIRM_YES" => "Ja, löschen", + "DELETE_CONFIRM_NAMED" => "Möchten Sie {{name}} wirklich löschen?", + "DELETE_CONFIRM_YES_NAMED" => "Ja, {{name}} löschen", + "DELETE_CANNOT_UNDONE" => "Diese Aktion kann nicht rückgängig gemacht werden.", + "DELETE_NAMED" => "{{name}} löschen", + "DENY" => "Verweigern", + "DISABLE" => "Deaktivieren", + "DISABLED" => "Deaktiviert", + "EDIT" => "Bearbeiten", + "ENABLE" => "Aktivieren", + "ENABLED" => "Aktiviert", + "OVERRIDE" => "Überschreiben", + "RESET" => "Zurücksetzen", + "SAVE" => "Speichern", + "SEARCH" => "Suchen", + "SORT" => "Sortieren", + "SUBMIT" => "Einreichen", + "PRINT" => "Drucken", + "REMOVE" => "Entfernen", + "UNACTIVATED" => "Unaktiviert", + "UPDATE" => "Aktualisieren", + "YES" => "Ja", + "NO" => "Nein", + "OPTIONAL" => "Optional", + + // Misc. + "BUILT_WITH_UF" => "Errichtet mit UserFrosting", + "ADMINLTE_THEME_BY" => "Theme von Almsaeed Studio. Alle Rechte vorbehalten", + "WELCOME_TO" => "Willkommen auf {{title}}!" +]; diff --git a/main/app/sprinkles/core/locale/tlh/validate.php b/main/app/sprinkles/core/locale/tlh/validate.php new file mode 100644 index 0000000..c10a20a --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/validate.php @@ -0,0 +1,32 @@ + [ + "ARRAY" => "Die Werte für {{label}} müssen in einem Feld liegen.", + "BOOLEAN" => "Der Wert für {{label}} muss entweder '0' oder '1' sein.", + "INTEGER" => "Der Wert für {{label}} muss eine ganze Zahl sein.", + "INVALID_EMAIL" => "Ungültige E-Mail-Adresse.", + "LENGTH_RANGE" => "{{label}} muss zwischen {{min}} und {{max}} Zeichen lang sein.", + "NO_LEAD_WS" => "Der Wert für {{label}} kann nicht mit Leerzeichen, Tabulatoren oder anderen Leerzeichen beginnen.", + "NO_TRAIL_WS" => "Der Wert für {{label}} kann nicht mit Leerzeichen, Tabulatoren oder anderen Leerzeichen enden.", + "REQUIRED" => "Bitte geben Sie einen Wert für {{label}} an.", + "SPRUNJE" => [ + "BAD_FILTER" => "{{name}} ist kein gültiger Filter für dieses Sprunje.", + "BAD_LIST" => "{{name}} ist kein gültige Liste für dieses Sprunje.", + "BAD_SORT" => "{{name}} ist kein gültiges Sortierungsfeld für dieses Sprunje." + ] + ] +]; diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index 417b7ab..26b0188 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -3,9 +3,9 @@ {% set page_active = "home" %} {# Overrides blocks in head of base template #} -{% block page_title %}{{translate("HOME")}}{% endblock %} +{% block page_title %}{{ translate("HOME") }}{% endblock %} -{% block page_description %}{{translate("WELCOME_TO", {'title': site.title})}}{% endblock %} +{% block page_description %}{{ translate("WELCOME_TO", {'title': site.title}) }}{% endblock %} {% block content %}
@@ -46,11 +46,13 @@
-
- -
- - +
+ +
+ +
@@ -79,14 +81,16 @@
- +

- {{ current_user.first_name}} {{current_user.last_name}}
- {{current_user.user_name}} -

+ {{ current_user.first_name }} {{ current_user.last_name }} +
+ {{ current_user.user_name }} +
+

@@ -94,19 +98,24 @@ -- cgit v1.2.3