Skip to content

Commit

Permalink
Use a "virtual" language code de-IN for informal german
Browse files Browse the repository at this point in the history
The IETF language specification compliant suffix "informal"  did not work with the i18n library used
  • Loading branch information
mrsimpson committed Sep 9, 2018
1 parent 23b4c41 commit 13d9969
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@
"Conversation_finished_message": "Konversation beendete Nachricht",
"conversation_with_s": "die Konversation mit% s",
"Conversation": "Gespräch",
"Conversations": "Gespräche",
"Convert_Ascii_Emojis": "ASCII zu Emoji konvertieren",
"Copied": "Kopiert",
"COPY_TO_CLIPBOARD": "IN DIE ZWISCHENABLAGE KOPIEREN",
Expand Down Expand Up @@ -2566,6 +2567,7 @@
"unarchive-room": "Raum aus dem Archiv holen",
"Unarchive": "Aus dem Archiv holen",
"Unblock_User": "Benutzer entsperren",
"Unfavorite": "Aus Favoriten entfernen",
"Unignore": "Unignore",
"Uninstall": "Uninstall",
"Unmute_someone_in_room": "Jemandem das Chatten in einem Raum wieder erlauben",
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/de.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@
"Conversation_finished_message": "Konversation beendete Nachricht",
"conversation_with_s": "die Konversation mit% s",
"Conversation": "Gespräch",
"Conversations": "Gespräche",
"Convert_Ascii_Emojis": "ASCII zu Emoji konvertieren",
"Copied": "Kopiert",
"COPY_TO_CLIPBOARD": "IN DIE ZWISCHENABLAGE KOPIEREN",
Expand Down Expand Up @@ -2566,6 +2567,7 @@
"unarchive-room": "Raum aus dem Archiv holen",
"Unarchive": "Aus dem Archiv holen",
"Unblock_User": "Benutzer entsperren",
"Unfavorite": "Aus Favoriten entfernen",
"Unignore": "Unignore",
"Uninstall": "Uninstall",
"Unmute_someone_in_room": "Jemandem das Chatten in einem Raum wieder erlauben",
Expand Down
2 changes: 1 addition & 1 deletion packages/tap-i18n/lib/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

globals = {
fallback_language: 'en',
langauges_tags_regex: '([a-z]{2})(-[A-Z]{2})?(-formal|-informal)?',
langauges_tags_regex: '([a-z]{2})(-[A-Z]{2})?',

This comment has been minimized.

Copy link
@kaiiiiiiiii

kaiiiiiiiii Sep 9, 2018

Contributor

Typo “langUAges”

This comment has been minimized.

Copy link
@mrsimpson

mrsimpson Sep 9, 2018

Author Collaborator

Interesting. I didn't change that, see the develop version.
It's a configuration of the library, so correcting this might break things 😆

This comment has been minimized.

Copy link
@mrsimpson

mrsimpson Sep 9, 2018

Author Collaborator

I just checked and the typo is really there in the library itself => Either a global search and replace (including potential dependencies), or just accept it. I'd go for the latter in this case.

project_translations_domain: 'project',
browser_path: '/tap-i18n',
debug: false,
Expand Down
2 changes: 1 addition & 1 deletion packages/tap-i18n/lib/plugin/etc/language_names.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ language_names = {
ka: ['Georgian', 'ქართული'],
de: ['German', 'Deutsch'],
'de-AT': ['German (Austria)', 'Östereichisches Deutsch'],
'de-informal': ['German (informal)', 'Deutsch (informell)'],
'de-IN': ['German (informal)', 'Deutsch (informell)'],
el: ['Greek', 'Ελληνικά'],
gn: ['Guaraní', 'Avañe\'ẽ'],
haw: ['Hawaiian', 'Ōlelo Hawaiʻi'],
Expand Down

0 comments on commit 13d9969

Please sign in to comment.