# HG changeset patch # User stetrabby # Date 1390038774 -3600 # Node ID 5a24b0072800163746b82d11ee8d5b83f65fefe6 # Parent f30cccb86f7f0c7aed149f90e55ecfefe5df51e8# Parent 31d8ca3c9cca38d59413d93be84fa0e2216a1cf0 Merge main diff -r f30cccb86f7f -r 5a24b0072800 pymove3d.py --- a/pymove3d.py Sat Jan 18 10:49:41 2014 +0100 +++ b/pymove3d.py Sat Jan 18 10:52:54 2014 +0100 @@ -20,40 +20,41 @@ def get_locale(): return request.accept_languages.best_match(LANGUAGES.keys()) + @app.route("/") -@app.route(_("/index")) +@app.route("/index") def index(): - return render_template(_("en/index.html")) + return render_template(get_locale() + "/index.html") -@app.route(_("/competition")) +@app.route("/competition") def competition(): - return render_template(_("en/competition.html"), act="competition") + return render_template(get_locale() + "/competition.html", act="competition") -@app.route(_("/task")) +@app.route("/task") def task(): - return render_template(_("en/task.html"), act="task") + return render_template(get_locale() + "/task.html", act="task") -@app.route(_("/submission")) +@app.route("/submission") def submission(): - return render_template(_("en/submission.html"), act="submission") + return render_template(get_locale() + "/submission.html", act="submission") -@app.route(_("/coursematerial")) +@app.route("/coursematerial") def coursematerial(): - return render_template(_("en/coursematerial.html"), act="coursematerial") + return render_template(get_locale() + "/coursematerial.html", act="coursematerial") -@app.route(_("/imprint")) +@app.route("/imprint") def imprint(): - return render_template(_("en/imprint.html"), act="imprint") + return render_template(get_locale () + "/imprint.html", act="imprint") -@app.route(_("/privacy")) +@app.route("/privacy") def privacy(): - return render_template(_("en/privacy.html"), act="privacy") + return render_template(get_locale() + "/privacy.html", act="privacy") @app.errorhandler(404) def page_not_found(e): - return render_template(_("en/404.html")), 404 + return render_template(get_locale() + "/404.html") if __name__ == "__main__": app.run(host='localhost', port=5014, debug=True) diff -r f30cccb86f7f -r 5a24b0072800 translations/de/LC_MESSAGES/messages.po --- a/translations/de/LC_MESSAGES/messages.po Sat Jan 18 10:49:41 2014 +0100 +++ b/translations/de/LC_MESSAGES/messages.po Sat Jan 18 10:52:54 2014 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-01-18 09:40+0100\n" -"PO-Revision-Date: 2014-01-18 09:40+0100\n" +"POT-Creation-Date: 2014-01-18 10:35+0100\n" +"PO-Revision-Date: 2014-01-18 10:35+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -18,63 +18,3 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: pymove3d.py:25 -msgid "/index" -msgstr "" - -#: pymove3d.py:27 -msgid "en/index.html" -msgstr "" - -#: pymove3d.py:29 -msgid "/competition" -msgstr "" - -#: pymove3d.py:31 -msgid "en/competition.html" -msgstr "" - -#: pymove3d.py:33 -msgid "/task" -msgstr "" - -#: pymove3d.py:35 -msgid "en/task.html" -msgstr "" - -#: pymove3d.py:37 -msgid "/submission" -msgstr "" - -#: pymove3d.py:39 -msgid "en/submission.html" -msgstr "" - -#: pymove3d.py:41 -msgid "/coursematerial" -msgstr "" - -#: pymove3d.py:43 -msgid "en/coursematerial.html" -msgstr "" - -#: pymove3d.py:45 -msgid "/imprint" -msgstr "" - -#: pymove3d.py:47 -msgid "en/imprint.html" -msgstr "" - -#: pymove3d.py:49 -msgid "/privacy" -msgstr "" - -#: pymove3d.py:51 -msgid "en/privacy.html" -msgstr "" - -#: pymove3d.py:56 -msgid "en/404.html" -msgstr "" - diff -r f30cccb86f7f -r 5a24b0072800 translations/en/LC_MESSAGES/messages.po --- a/translations/en/LC_MESSAGES/messages.po Sat Jan 18 10:49:41 2014 +0100 +++ b/translations/en/LC_MESSAGES/messages.po Sat Jan 18 10:52:54 2014 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-01-18 09:40+0100\n" -"PO-Revision-Date: 2014-01-18 09:40+0100\n" +"POT-Creation-Date: 2014-01-18 10:35+0100\n" +"PO-Revision-Date: 2014-01-18 10:35+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -18,63 +18,3 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: pymove3d.py:25 -msgid "/index" -msgstr "" - -#: pymove3d.py:27 -msgid "en/index.html" -msgstr "" - -#: pymove3d.py:29 -msgid "/competition" -msgstr "" - -#: pymove3d.py:31 -msgid "en/competition.html" -msgstr "" - -#: pymove3d.py:33 -msgid "/task" -msgstr "" - -#: pymove3d.py:35 -msgid "en/task.html" -msgstr "" - -#: pymove3d.py:37 -msgid "/submission" -msgstr "" - -#: pymove3d.py:39 -msgid "en/submission.html" -msgstr "" - -#: pymove3d.py:41 -msgid "/coursematerial" -msgstr "" - -#: pymove3d.py:43 -msgid "en/coursematerial.html" -msgstr "" - -#: pymove3d.py:45 -msgid "/imprint" -msgstr "" - -#: pymove3d.py:47 -msgid "en/imprint.html" -msgstr "" - -#: pymove3d.py:49 -msgid "/privacy" -msgstr "" - -#: pymove3d.py:51 -msgid "en/privacy.html" -msgstr "" - -#: pymove3d.py:56 -msgid "en/404.html" -msgstr "" - diff -r f30cccb86f7f -r 5a24b0072800 translations/pymove3d.pot --- a/translations/pymove3d.pot Sat Jan 18 10:49:41 2014 +0100 +++ b/translations/pymove3d.pot Sat Jan 18 10:52:54 2014 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-01-18 09:40+0100\n" +"POT-Creation-Date: 2014-01-18 10:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,63 +17,3 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: pymove3d.py:25 -msgid "/index" -msgstr "" - -#: pymove3d.py:27 -msgid "en/index.html" -msgstr "" - -#: pymove3d.py:29 -msgid "/competition" -msgstr "" - -#: pymove3d.py:31 -msgid "en/competition.html" -msgstr "" - -#: pymove3d.py:33 -msgid "/task" -msgstr "" - -#: pymove3d.py:35 -msgid "en/task.html" -msgstr "" - -#: pymove3d.py:37 -msgid "/submission" -msgstr "" - -#: pymove3d.py:39 -msgid "en/submission.html" -msgstr "" - -#: pymove3d.py:41 -msgid "/coursematerial" -msgstr "" - -#: pymove3d.py:43 -msgid "en/coursematerial.html" -msgstr "" - -#: pymove3d.py:45 -msgid "/imprint" -msgstr "" - -#: pymove3d.py:47 -msgid "en/imprint.html" -msgstr "" - -#: pymove3d.py:49 -msgid "/privacy" -msgstr "" - -#: pymove3d.py:51 -msgid "en/privacy.html" -msgstr "" - -#: pymove3d.py:56 -msgid "en/404.html" -msgstr "" -