Skip to content

Commit

Permalink
changing to UTF8, fixing rename on windows eclipse-sumo#11237
Browse files Browse the repository at this point in the history
  • Loading branch information
@behrisch
behrisch committed Oct 11, 2022
1 parent d5bd94d commit 3998754
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*.csv text eol=lf
*.txt text eol=lf
*.tcl text eol=lf
*.po text eol=lf

*.complex text eol=lf
*.dfrouter text eol=lf
Expand Down
12 changes: 8 additions & 4 deletions data/po/de_gui.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@ msgid ""
msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-10-10 07:37+0200\n"
"POT-Creation-Date: 2022-10-11 10:52+0200\n"
"PO-Revision-Date: 2022-10-09 17:46+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ASCII\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: /home/micha/sumo/src/guisim_main.cpp:59
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\guisim_main.cpp:60
msgid "GUI version of the microscopic, multi-modal traffic simulation SUMO."
msgstr ""
"Grafische Version der mikroskopischen, multimodalen Verkehrssimulation SUMO."

#: /home/micha/sumo/src/gui/GUIApplicationWindow.cpp:437
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\guisim_main.cpp:80
msgid "This system has no OpenGL support. Exiting."
msgstr "Dieses System hat keine OpenGL-Unterstützung. Ende."

#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\gui\GUIApplicationWindow.cpp:437
msgid "&File"
msgstr "&Datei"
14 changes: 7 additions & 7 deletions data/po/de_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-10-09 18:08+0200\n"
"POT-Creation-Date: 2022-10-10 18:15+0200\n"
"PO-Revision-Date: 2022-10-09 17:46+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand All @@ -17,23 +17,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: /home/micha/sumo/src/sumo_main.cpp:49
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:49
msgid "Another interrupt signal received, hard exit."
msgstr ""

#: /home/micha/sumo/src/sumo_main.cpp:52
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:52
msgid "Interrupt signal received, trying to exit gracefully."
msgstr ""

#: /home/micha/sumo/src/sumo_main.cpp:88
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:86
msgid "A microscopic, multi-modal traffic simulation."
msgstr "Eine mikroskopische, multimodale Verkehrssimulation."

#: /home/micha/sumo/src/sumo_main.cpp:116
#: /home/micha/sumo/src/sumo_main.cpp:125
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:114
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:123
msgid "Quitting (on error)."
msgstr ""

#: /home/micha/sumo/src/sumo_main.cpp:128
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:126
msgid "Quitting (on unknown error)."
msgstr ""
14 changes: 9 additions & 5 deletions data/po/fr_gui.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-10-10 07:37+0200\n"
"PO-Revision-Date: 2022-10-09 17:46+0200\n"
"POT-Creation-Date: 2022-10-11 10:52+0200\n"
"PO-Revision-Date: 2022-10-11 10:52+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ASCII\n"
"Content-Type: text/plain; charset=CP1252\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#: /home/micha/sumo/src/guisim_main.cpp:59
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\guisim_main.cpp:60
msgid "GUI version of the microscopic, multi-modal traffic simulation SUMO."
msgstr ""

#: /home/micha/sumo/src/gui/GUIApplicationWindow.cpp:437
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\guisim_main.cpp:80
msgid "This system has no OpenGL support. Exiting."
msgstr ""

#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\gui\GUIApplicationWindow.cpp:437
msgid "&File"
msgstr ""
16 changes: 8 additions & 8 deletions data/po/fr_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,33 @@ msgid ""
msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-10-09 18:08+0200\n"
"POT-Creation-Date: 2022-10-10 18:15+0200\n"
"PO-Revision-Date: 2022-10-09 17:46+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ASCII\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#: /home/micha/sumo/src/sumo_main.cpp:49
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:49
msgid "Another interrupt signal received, hard exit."
msgstr ""

#: /home/micha/sumo/src/sumo_main.cpp:52
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:52
msgid "Interrupt signal received, trying to exit gracefully."
msgstr ""

#: /home/micha/sumo/src/sumo_main.cpp:88
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:86
msgid "A microscopic, multi-modal traffic simulation."
msgstr ""

#: /home/micha/sumo/src/sumo_main.cpp:116
#: /home/micha/sumo/src/sumo_main.cpp:125
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:114
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:123
msgid "Quitting (on error)."
msgstr ""

#: /home/micha/sumo/src/sumo_main.cpp:128
#: C:\Users\behr_mi\Projekte\sumo\repos\sumo/src\sumo_main.cpp:126
msgid "Quitting (on unknown error)."
msgstr ""
2 changes: 1 addition & 1 deletion src/guisim_main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ main(int argc, char** argv) {
application.init(argc, argv);
int minor, major;
if (!FXGLVisual::supported(&application, major, minor)) {
throw ProcessError("This system has no OpenGL support. Exiting.");
throw ProcessError(TL("This system has no OpenGL support. Exiting."));
}

// build the main window
Expand Down
3 changes: 2 additions & 1 deletion tools/build/i18n.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def main(args=None):
print(f, file=pots[pot_file])
for pot, sources in pots.items():
sources.close()
subprocess.check_call([path + "xgettext", "--files-from=" + sources.name,
subprocess.check_call([path + "xgettext", "--files-from=" + sources.name, "--from-code=UTF-8",
"--keyword=TL", "--output=" + pot + ".new", "--package-name=sumo",
"[email protected]"])
os.remove(sources.name)
Expand All @@ -67,6 +67,7 @@ def main(args=None):
b = [s for s in new.readlines() if not s.startswith(("#", '"POT-Creation-Date:'))]
has_diff = list(difflib.unified_diff(a, b))
if has_diff:
os.remove(pot)
os.rename(pot + ".new", pot)
else:
os.remove(pot + ".new")
Expand Down

0 comments on commit 3998754

Please sign in to comment.