Merge main
authorstetrabby <info@trabucchi.de>
Sat, 18 Jan 2014 10:52:54 +0100
changeset 1055a24b0072800
parent 104 f30cccb86f7f (current diff)
parent 103 31d8ca3c9cca (diff)
child 106 b0e55e971315
Merge main
     1.1 --- a/pymove3d.py	Sat Jan 18 10:49:41 2014 +0100
     1.2 +++ b/pymove3d.py	Sat Jan 18 10:52:54 2014 +0100
     1.3 @@ -20,40 +20,41 @@
     1.4  def get_locale():
     1.5      return request.accept_languages.best_match(LANGUAGES.keys())
     1.6  
     1.7 +
     1.8  @app.route("/")
     1.9  
    1.10 -@app.route(_("/index"))
    1.11 +@app.route("/index")
    1.12  def index():
    1.13 -    return render_template(_("en/index.html"))
    1.14 +    return render_template(get_locale() + "/index.html")
    1.15  
    1.16 -@app.route(_("/competition"))
    1.17 +@app.route("/competition")
    1.18  def competition():
    1.19 -    return render_template(_("en/competition.html"), act="competition")
    1.20 +    return render_template(get_locale() + "/competition.html", act="competition")
    1.21  
    1.22 -@app.route(_("/task"))
    1.23 +@app.route("/task")
    1.24  def task():
    1.25 -    return render_template(_("en/task.html"), act="task")
    1.26 +    return render_template(get_locale() + "/task.html", act="task")
    1.27  
    1.28 -@app.route(_("/submission"))
    1.29 +@app.route("/submission")
    1.30  def submission():
    1.31 -    return render_template(_("en/submission.html"), act="submission")
    1.32 +    return render_template(get_locale() + "/submission.html", act="submission")
    1.33  
    1.34 -@app.route(_("/coursematerial"))
    1.35 +@app.route("/coursematerial")
    1.36  def coursematerial():
    1.37 -    return render_template(_("en/coursematerial.html"), act="coursematerial")
    1.38 +    return render_template(get_locale() + "/coursematerial.html", act="coursematerial")
    1.39  
    1.40 -@app.route(_("/imprint"))
    1.41 +@app.route("/imprint")
    1.42  def imprint():
    1.43 -    return render_template(_("en/imprint.html"), act="imprint")
    1.44 +    return render_template(get_locale () + "/imprint.html", act="imprint")
    1.45  
    1.46 -@app.route(_("/privacy"))
    1.47 +@app.route("/privacy")
    1.48  def privacy():
    1.49 -    return render_template(_("en/privacy.html"), act="privacy")
    1.50 +    return render_template(get_locale() + "/privacy.html", act="privacy")
    1.51  
    1.52  
    1.53  @app.errorhandler(404)
    1.54  def page_not_found(e):
    1.55 -    return render_template(_("en/404.html")), 404
    1.56 +    return render_template(get_locale() + "/404.html")
    1.57  
    1.58  if __name__ == "__main__":
    1.59      app.run(host='localhost', port=5014, debug=True)
     2.1 --- a/translations/de/LC_MESSAGES/messages.po	Sat Jan 18 10:49:41 2014 +0100
     2.2 +++ b/translations/de/LC_MESSAGES/messages.po	Sat Jan 18 10:52:54 2014 +0100
     2.3 @@ -8,8 +8,8 @@
     2.4  msgstr ""
     2.5  "Project-Id-Version: PROJECT VERSION\n"
     2.6  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
     2.7 -"POT-Creation-Date: 2014-01-18 09:40+0100\n"
     2.8 -"PO-Revision-Date: 2014-01-18 09:40+0100\n"
     2.9 +"POT-Creation-Date: 2014-01-18 10:35+0100\n"
    2.10 +"PO-Revision-Date: 2014-01-18 10:35+0100\n"
    2.11  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    2.12  "Language-Team: de <LL@li.org>\n"
    2.13  "Plural-Forms: nplurals=2; plural=(n != 1)\n"
    2.14 @@ -18,63 +18,3 @@
    2.15  "Content-Transfer-Encoding: 8bit\n"
    2.16  "Generated-By: Babel 1.3\n"
    2.17  
    2.18 -#: pymove3d.py:25
    2.19 -msgid "/index"
    2.20 -msgstr ""
    2.21 -
    2.22 -#: pymove3d.py:27
    2.23 -msgid "en/index.html"
    2.24 -msgstr ""
    2.25 -
    2.26 -#: pymove3d.py:29
    2.27 -msgid "/competition"
    2.28 -msgstr ""
    2.29 -
    2.30 -#: pymove3d.py:31
    2.31 -msgid "en/competition.html"
    2.32 -msgstr ""
    2.33 -
    2.34 -#: pymove3d.py:33
    2.35 -msgid "/task"
    2.36 -msgstr ""
    2.37 -
    2.38 -#: pymove3d.py:35
    2.39 -msgid "en/task.html"
    2.40 -msgstr ""
    2.41 -
    2.42 -#: pymove3d.py:37
    2.43 -msgid "/submission"
    2.44 -msgstr ""
    2.45 -
    2.46 -#: pymove3d.py:39
    2.47 -msgid "en/submission.html"
    2.48 -msgstr ""
    2.49 -
    2.50 -#: pymove3d.py:41
    2.51 -msgid "/coursematerial"
    2.52 -msgstr ""
    2.53 -
    2.54 -#: pymove3d.py:43
    2.55 -msgid "en/coursematerial.html"
    2.56 -msgstr ""
    2.57 -
    2.58 -#: pymove3d.py:45
    2.59 -msgid "/imprint"
    2.60 -msgstr ""
    2.61 -
    2.62 -#: pymove3d.py:47
    2.63 -msgid "en/imprint.html"
    2.64 -msgstr ""
    2.65 -
    2.66 -#: pymove3d.py:49
    2.67 -msgid "/privacy"
    2.68 -msgstr ""
    2.69 -
    2.70 -#: pymove3d.py:51
    2.71 -msgid "en/privacy.html"
    2.72 -msgstr ""
    2.73 -
    2.74 -#: pymove3d.py:56
    2.75 -msgid "en/404.html"
    2.76 -msgstr ""
    2.77 -
     3.1 --- a/translations/en/LC_MESSAGES/messages.po	Sat Jan 18 10:49:41 2014 +0100
     3.2 +++ b/translations/en/LC_MESSAGES/messages.po	Sat Jan 18 10:52:54 2014 +0100
     3.3 @@ -8,8 +8,8 @@
     3.4  msgstr ""
     3.5  "Project-Id-Version: PROJECT VERSION\n"
     3.6  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
     3.7 -"POT-Creation-Date: 2014-01-18 09:40+0100\n"
     3.8 -"PO-Revision-Date: 2014-01-18 09:40+0100\n"
     3.9 +"POT-Creation-Date: 2014-01-18 10:35+0100\n"
    3.10 +"PO-Revision-Date: 2014-01-18 10:35+0100\n"
    3.11  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    3.12  "Language-Team: en <LL@li.org>\n"
    3.13  "Plural-Forms: nplurals=2; plural=(n != 1)\n"
    3.14 @@ -18,63 +18,3 @@
    3.15  "Content-Transfer-Encoding: 8bit\n"
    3.16  "Generated-By: Babel 1.3\n"
    3.17  
    3.18 -#: pymove3d.py:25
    3.19 -msgid "/index"
    3.20 -msgstr ""
    3.21 -
    3.22 -#: pymove3d.py:27
    3.23 -msgid "en/index.html"
    3.24 -msgstr ""
    3.25 -
    3.26 -#: pymove3d.py:29
    3.27 -msgid "/competition"
    3.28 -msgstr ""
    3.29 -
    3.30 -#: pymove3d.py:31
    3.31 -msgid "en/competition.html"
    3.32 -msgstr ""
    3.33 -
    3.34 -#: pymove3d.py:33
    3.35 -msgid "/task"
    3.36 -msgstr ""
    3.37 -
    3.38 -#: pymove3d.py:35
    3.39 -msgid "en/task.html"
    3.40 -msgstr ""
    3.41 -
    3.42 -#: pymove3d.py:37
    3.43 -msgid "/submission"
    3.44 -msgstr ""
    3.45 -
    3.46 -#: pymove3d.py:39
    3.47 -msgid "en/submission.html"
    3.48 -msgstr ""
    3.49 -
    3.50 -#: pymove3d.py:41
    3.51 -msgid "/coursematerial"
    3.52 -msgstr ""
    3.53 -
    3.54 -#: pymove3d.py:43
    3.55 -msgid "en/coursematerial.html"
    3.56 -msgstr ""
    3.57 -
    3.58 -#: pymove3d.py:45
    3.59 -msgid "/imprint"
    3.60 -msgstr ""
    3.61 -
    3.62 -#: pymove3d.py:47
    3.63 -msgid "en/imprint.html"
    3.64 -msgstr ""
    3.65 -
    3.66 -#: pymove3d.py:49
    3.67 -msgid "/privacy"
    3.68 -msgstr ""
    3.69 -
    3.70 -#: pymove3d.py:51
    3.71 -msgid "en/privacy.html"
    3.72 -msgstr ""
    3.73 -
    3.74 -#: pymove3d.py:56
    3.75 -msgid "en/404.html"
    3.76 -msgstr ""
    3.77 -
     4.1 --- a/translations/pymove3d.pot	Sat Jan 18 10:49:41 2014 +0100
     4.2 +++ b/translations/pymove3d.pot	Sat Jan 18 10:52:54 2014 +0100
     4.3 @@ -8,7 +8,7 @@
     4.4  msgstr ""
     4.5  "Project-Id-Version: PROJECT VERSION\n"
     4.6  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
     4.7 -"POT-Creation-Date: 2014-01-18 09:40+0100\n"
     4.8 +"POT-Creation-Date: 2014-01-18 10:35+0100\n"
     4.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    4.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    4.11  "Language-Team: LANGUAGE <LL@li.org>\n"
    4.12 @@ -17,63 +17,3 @@
    4.13  "Content-Transfer-Encoding: 8bit\n"
    4.14  "Generated-By: Babel 1.3\n"
    4.15  
    4.16 -#: pymove3d.py:25
    4.17 -msgid "/index"
    4.18 -msgstr ""
    4.19 -
    4.20 -#: pymove3d.py:27
    4.21 -msgid "en/index.html"
    4.22 -msgstr ""
    4.23 -
    4.24 -#: pymove3d.py:29
    4.25 -msgid "/competition"
    4.26 -msgstr ""
    4.27 -
    4.28 -#: pymove3d.py:31
    4.29 -msgid "en/competition.html"
    4.30 -msgstr ""
    4.31 -
    4.32 -#: pymove3d.py:33
    4.33 -msgid "/task"
    4.34 -msgstr ""
    4.35 -
    4.36 -#: pymove3d.py:35
    4.37 -msgid "en/task.html"
    4.38 -msgstr ""
    4.39 -
    4.40 -#: pymove3d.py:37
    4.41 -msgid "/submission"
    4.42 -msgstr ""
    4.43 -
    4.44 -#: pymove3d.py:39
    4.45 -msgid "en/submission.html"
    4.46 -msgstr ""
    4.47 -
    4.48 -#: pymove3d.py:41
    4.49 -msgid "/coursematerial"
    4.50 -msgstr ""
    4.51 -
    4.52 -#: pymove3d.py:43
    4.53 -msgid "en/coursematerial.html"
    4.54 -msgstr ""
    4.55 -
    4.56 -#: pymove3d.py:45
    4.57 -msgid "/imprint"
    4.58 -msgstr ""
    4.59 -
    4.60 -#: pymove3d.py:47
    4.61 -msgid "en/imprint.html"
    4.62 -msgstr ""
    4.63 -
    4.64 -#: pymove3d.py:49
    4.65 -msgid "/privacy"
    4.66 -msgstr ""
    4.67 -
    4.68 -#: pymove3d.py:51
    4.69 -msgid "en/privacy.html"
    4.70 -msgstr ""
    4.71 -
    4.72 -#: pymove3d.py:56
    4.73 -msgid "en/404.html"
    4.74 -msgstr ""
    4.75 -
Impressum Datenschutzerklärung