diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
commit | 151e42654a4bcfcff408c7799db199c71e81b5c5 (patch) | |
tree | 02786db1039902c7cc75f76aa7159829299970ac /ishtar_common/ooo_translation.py | |
parent | 661218e0acd24fc3bca76229b61d0cb91a54be1c (diff) | |
parent | 5eb8667794636e379a8c324da46c617ad365747a (diff) | |
download | Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.tar.bz2 Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.zip |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/ooo_translation.py')
-rw-r--r-- | ishtar_common/ooo_translation.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ishtar_common/ooo_translation.py b/ishtar_common/ooo_translation.py index a93a916ae..5a3d4cb84 100644 --- a/ishtar_common/ooo_translation.py +++ b/ishtar_common/ooo_translation.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (C) 2013-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2013-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,9 +19,10 @@ from django.conf import settings from django.utils import translation -from django.utils.translation import pgettext_lazy +# from django.utils.translation import pgettext_lazy + +# [('study', pgettext_lazy('ooo key', u'study')),] -# [('study', pgettext_lazy('ooo key', u'study')),] TRANSLATION_STRINGS = [] ooo_translation = {} |