Skip to content

Commit

Permalink
Updated Esperanto translation. Fixed an issue with the language strin…
Browse files Browse the repository at this point in the history
…g trying to overwrite itself.
  • Loading branch information
riksweeney committed Apr 22, 2018
1 parent 92f9f4c commit 03fc06a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 21 deletions.
1 change: 1 addition & 0 deletions doc/changes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGE LOG
Version 1.29
* Added Indonesian translation
* Updated Esperanto translation
* Fixed a crash on some systems when determining the localisation

Version 1.28
* Updated German, Italian, Japanese, Simplified Chinese, Russian and Ukrainian translations
Expand Down
24 changes: 12 additions & 12 deletions locale/eo.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: edgar\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-07-16 13:33+0100\n"
"PO-Revision-Date: 2018-01-17 02:15+0000\n"
"PO-Revision-Date: 2018-04-21 04:57+0000\n"
"Last-Translator: Stefan Haubenthal <[email protected]>\n"
"Language-Team: Esperanto <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2018-01-17 06:56+0000\n"
"X-Generator: Launchpad (build 18532)\n"
"X-Launchpad-Export-Date: 2018-04-21 10:28+0000\n"
"X-Generator: Launchpad (build 18617)\n"
"Language: eo\n"

#: data/scripts/olaf.dat:6
Expand Down Expand Up @@ -6326,7 +6326,7 @@ msgstr ""

#: src/boss/chaos.c:1687
msgid "Darkness"
msgstr ""
msgstr "Mallumo"

#: src/boss/sorceror_2.c:1551
msgid "Hold Person"
Expand Down Expand Up @@ -6359,19 +6359,19 @@ msgstr ""

#: src/item/attractor.c:36
msgid "Rift"
msgstr ""
msgstr "Fendo"

#: src/boss/chaos.c:460
msgid "Tendrils"
msgstr ""

#: src/boss/chaos.c:1046
msgid "Orbs"
msgstr ""
msgstr "Orboj"

#: src/boss/chaos.c:1312
msgid "I will destroy you!"
msgstr ""
msgstr "Mi detruos vin!"

#: data/scripts/chaos_finish.dat:17
msgid "He must have teleported me away with the last of his magic"
Expand Down Expand Up @@ -6401,7 +6401,7 @@ msgstr ""

#: data/scripts/chaos_die.dat:13
msgid "This must be Ivan's sword"
msgstr ""
msgstr "Ĉi tio devas esti la glavo de Ivano"

#: data/scripts/chaos_die.dat:14
msgid "You... You will never defeat me"
Expand Down Expand Up @@ -6483,7 +6483,7 @@ msgstr ""

#: data/scripts/mataeus_boss_die.dat:1
msgid "Magical Knife"
msgstr ""
msgstr "Magia Tranĉilo"

#: data/maps/map11.dat:5217
msgid "Third Floor Passage Key"
Expand All @@ -6507,11 +6507,11 @@ msgstr ""

#: data/scripts/cauldron.dat:147
msgid "Old Shield"
msgstr ""
msgstr "Malnova Ŝildo"

#: data/maps/map15.dat:2567
msgid "Old Key"
msgstr ""
msgstr "Malnova Ŝlosilo"

#: data/maps/map09.dat:7793
msgid "Lava Lift Key"
Expand Down Expand Up @@ -6539,7 +6539,7 @@ msgstr ""

#: data/maps/map10.dat:3167
msgid "Potion of Invisibility"
msgstr ""
msgstr "Pafo de Nevidebleco"

#: data/scripts/slime_potion.dat:8
msgid "Potion of Transmogrification"
Expand Down
11 changes: 2 additions & 9 deletions src/i18n.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@ void setLanguage(char *applicationName, char *languageCode)
STRNCPY(language, languageCode, MAX_LINE_LENGTH);
}

if (strstr(language, ".") != NULL)
{
lang = strtok(language, ".");

STRNCPY(language, lang, MAX_LINE_LENGTH);
}
strtok(language, ".");

printf("Locale is %s\n", language);

Expand All @@ -100,9 +95,7 @@ void setLanguage(char *applicationName, char *languageCode)
return;
}

lang = strtok(language, "_");

STRNCPY(language, lang, MAX_LINE_LENGTH);
strtok(language, "_");

snprintf(c, MAX_LINE_LENGTH, "%s/%s/LC_MESSAGES/%s.mo", LOCALE_DIR, language, applicationName);

Expand Down

0 comments on commit 03fc06a

Please sign in to comment.