prepared language switching based on browser, various small tweaks and bugfixes

parent 5a863785
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: failmap/map/static/js/failmap.js:71 failmap/map/static/js/views.js:817
#: failmap/map/static/js/views.js:822 failmap/map/static/js/views.js:825
......
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 20:19+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 20:19+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -381,6 +381,7 @@ def rate_timeline(timeline, url: Url):
"high": 0,
"medium": 0,
"low": 0,
"ratings": [],
"endpoints": []
}
}
......
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -134,6 +134,12 @@ MIDDLEWARE = [
'django_statsd.middleware.GraphiteRequestTimingMiddleware',
'django_statsd.middleware.GraphiteMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
# based on cookie or based on user agent. So people with Dutch browsers will see the Dutch version(?).
# This project is going to be used in a variety of countries, with multiple languages, so auto-setting this
# makes sense over having a fixed single option.
# https://docs.djangoproject.com/en/2.0/topics/i18n/translation/#how-django-discovers-language-preference
'django.middleware.locale.LocaleMiddleware',
'django.middleware.security.SecurityMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
......@@ -241,7 +247,7 @@ AUTH_PASSWORD_VALIDATORS = [
# shoddy documentation on dashes and underscores... different than the "ll" suggestion.
# LANGUAGE_CODE = 'en-gb'
LANGUAGES = (
('en', 'English'),
# ('en', 'English'), # temporarily disable english until those translations are fixed.
('nl', 'Dutch'),
# This helps to find missing translations. Using this language the goal is to replace all text
# strings with a single rainbow. In the end there should be no text, only rainbows! 🌈
......@@ -251,6 +257,8 @@ LANGUAGES = (
# There is no 🌈🦄 translation for humanize. Instead you'll get the english fallback values.
LANGUAGE_CODE = 'nl'
LANGUAGE_COOKIE_NAME = 'language'
TIME_ZONE = 'UTC'
USE_I18N = True
......@@ -263,7 +271,11 @@ USE_TZ = True
# https://docs.djangoproject.com/en/1.11/topics/i18n/translation/#how-django-discovers-translations
# In all cases the name of the directory containing the translation is expected to be named using
# locale name notation. E.g. de, pt_BR, es_AR, etc.
LOCALE_PATHS = ['locale']
LOCALE_PATHS = (
os.path.join(BASE_DIR, 'locale'),
)
print(LOCALE_PATHS)
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/
......@@ -875,8 +887,3 @@ JET_SIDE_MENU_ITEMS = [ # A list of application or custom item dicts
]
# end django jet menu configuration
########
# Huge celery tasks require a connection to be open longer than just a single request.
# this setting might become problematic.
# https://docs.djangoproject.com/en/2.0/ref/settings/#conn-max-age
CONN_MAX_AGE = 0
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -16,6 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: failmap/app/dashboard.py:60
msgid "Content"
......@@ -58,46 +59,46 @@ msgstr ""
msgid "Recent Actions for %s"
msgstr ""
#: failmap/settings.py:810
#: failmap/settings.py:816
msgid "🔧 configuration"
msgstr ""
#: failmap/settings.py:813
#: failmap/settings.py:819
msgid "configuration"
msgstr ""
#: failmap/settings.py:814
#: failmap/settings.py:820
msgid "map configuration"
msgstr ""
#: failmap/settings.py:815
#: failmap/settings.py:821
msgid "import regions"
msgstr ""
#: failmap/settings.py:818
#: failmap/settings.py:824
msgid "🏢 organizations"
msgstr ""
#: failmap/settings.py:826
#: failmap/settings.py:832
msgid "🔬 scanners"
msgstr ""
#: failmap/settings.py:836
#: failmap/settings.py:842
msgid "🗺️ map (autogenerated)"
msgstr ""
#: failmap/settings.py:841
#: failmap/settings.py:847
msgid "🕒 periodic tasks"
msgstr ""
#: failmap/settings.py:849
#: failmap/settings.py:855
msgid "ℹ️ helpdesk"
msgstr ""
#: failmap/settings.py:862
#: failmap/settings.py:868
msgid "☁️ hypersh cloud scans"
msgstr ""
#: failmap/settings.py:869
#: failmap/settings.py:875
msgid "👾️ the game"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: docs/build/html/_static/doctools.js:191
msgid "Permalink to this headline"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -59,46 +59,46 @@ msgstr ""
msgid "Recent Actions for %s"
msgstr ""
#: failmap/settings.py:810
#: failmap/settings.py:816
msgid "🔧 configuration"
msgstr ""
#: failmap/settings.py:813
#: failmap/settings.py:819
msgid "configuration"
msgstr "Algemene instellingen"
#: failmap/settings.py:814
#: failmap/settings.py:820
msgid "map configuration"
msgstr "Kaart instellingen"
#: failmap/settings.py:815
#: failmap/settings.py:821
msgid "import regions"
msgstr "Importeer gebieden"
#: failmap/settings.py:818
#: failmap/settings.py:824
msgid "🏢 organizations"
msgstr "🏢 Organisaties"
#: failmap/settings.py:826
#: failmap/settings.py:832
msgid "🔬 scanners"
msgstr "🔬 Scanners"
#: failmap/settings.py:836
#: failmap/settings.py:842
msgid "🗺️ map (autogenerated)"
msgstr ""
#: failmap/settings.py:841
#: failmap/settings.py:847
msgid "🕒 periodic tasks"
msgstr "🕒 Periodieke taken"
#: failmap/settings.py:849
#: failmap/settings.py:855
msgid "ℹ️ helpdesk"
msgstr "ℹ️ Helpdesk"
#: failmap/settings.py:862
#: failmap/settings.py:868
msgid "☁️ hypersh cloud scans"
msgstr ""
#: failmap/settings.py:869
#: failmap/settings.py:875
msgid "👾️ the game"
msgstr "👾️ Het spel (beta)"
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 20:19+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 19:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -58,46 +58,46 @@ msgstr ""
msgid "Recent Actions for %s"
msgstr ""
#: failmap/settings.py:810
#: failmap/settings.py:816
msgid "🔧 configuration"
msgstr ""
#: failmap/settings.py:813
#: failmap/settings.py:819
msgid "configuration"
msgstr ""
#: failmap/settings.py:814
#: failmap/settings.py:820
msgid "map configuration"
msgstr ""
#: failmap/settings.py:815
#: failmap/settings.py:821
msgid "import regions"
msgstr ""
#: failmap/settings.py:818
#: failmap/settings.py:824
msgid "🏢 organizations"
msgstr ""
#: failmap/settings.py:826
#: failmap/settings.py:832
msgid "🔬 scanners"
msgstr ""
#: failmap/settings.py:836
#: failmap/settings.py:842
msgid "🗺️ map (autogenerated)"
msgstr ""
#: failmap/settings.py:841
#: failmap/settings.py:847
msgid "🕒 periodic tasks"
msgstr ""
#: failmap/settings.py:849
#: failmap/settings.py:855
msgid "ℹ️ helpdesk"
msgstr ""
#: failmap/settings.py:862
#: failmap/settings.py:868
msgid "☁️ hypersh cloud scans"
msgstr ""
#: failmap/settings.py:869
#: failmap/settings.py:875
msgid "👾️ the game"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-03 13:48+0000\n"
"POT-Creation-Date: 2018-05-03 20:19+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment