Add language folders

TuxEatPi · Aug 30, 2016 · 46074d9 · 46074d9
1 parent c333528
commit 46074d9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,5 @@ cover/
 tuxeatpi-conf.yml
 build/
 dist
-locale/messages.pot
+tuxeatpi/locale/messages.pot
 *.mo
diff --git a/Makefile b/Makefile
@@ -39,13 +39,13 @@ doc-generate:
 ### Test targets
 #######################################
 lang-scan:
-	pygettext3.5 --output-dir=locale/  -k gtt -va -x tuxeatpi/libs/lang.py tuxeatpi/*.py tuxeatpi/*/*.py
-	cd locale && msgmerge --update --no-fuzzy-matching --backup=off en/LC_MESSAGES/tuxeatpi.po messages.pot
-	cd locale && msgmerge --update --no-fuzzy-matching --backup=off fr/LC_MESSAGES/tuxeatpi.po messages.pot
+	pygettext3.5 --output-dir=tuxeatpi/locale/  -k gtt -va -x tuxeatpi/libs/lang.py tuxeatpi/*.py tuxeatpi/*/*.py
+	cd tuxeatpi/locale && msgmerge --update --no-fuzzy-matching --backup=off en/LC_MESSAGES/tuxeatpi.po messages.pot
+	cd tuxeatpi/locale && msgmerge --update --no-fuzzy-matching --backup=off fr/LC_MESSAGES/tuxeatpi.po messages.pot
 
 lang-gen:
-	cd locale/fr/LC_MESSAGES/ && msgfmt tuxeatpi.po -o tuxeatpi.mo
-	cd locale/en/LC_MESSAGES/ && msgfmt tuxeatpi.po -o tuxeatpi.mo
+	cd tuxeatpi/locale/fr/LC_MESSAGES/ && msgfmt tuxeatpi.po -o tuxeatpi.mo
+	cd tuxeatpi/locale/en/LC_MESSAGES/ && msgfmt tuxeatpi.po -o tuxeatpi.mo
 
 #######################################
 ### Test targets

diff --git a/setup.py b/setup.py
@@ -36,7 +36,11 @@
     author_email='titilambert@gmail.com',
     url="https://github.com/TuxEatPi/tuxeatpi",
     download_url="https://github.com/TuxEatPi/tuxeatpi/archive/0.0.1.tar.gz",
-    package_data={'': ['LICENSE.txt']},
+    package_data={'': ['LICENSE.txt'], 'tuxeatpi': ['locale/*/LC_MESSAGES/tuxeatpi.po']},
+#    data_files = [('locale', ['locale/fr/LC_MESSAGES/tuxeatpi.po',
+ #                             'locale/en/LC_MESSAGES/tuxeatpi.po',
+ #                             ]
+ #                  )],
     package_dir={'tuxeatpi': 'tuxeatpi'},
     include_package_data=True,
     license='Apache 2.0',

diff --git a/tuxeatpi/libs/lang.py b/tuxeatpi/libs/lang.py
@@ -12,11 +12,11 @@ def load_languages():
     TODO: make it more dynamic
     """
     # Prepare
-    gettext.bindtextdomain('tuxeatpi', 'locale')
+    gettext.bindtextdomain('tuxeatpi', 'tuxeatpi/locale')
     gettext.textdomain('tuxeatpi')
     # Load languages
-    _lang_en = gettext.translation('tuxeatpi', localedir='locale', languages=['en'], fallback=True)
-    _lang_fr = gettext.translation('tuxeatpi', localedir='locale', languages=['fr'])
+    _lang_en = gettext.translation('tuxeatpi', localedir='tuxeatpi/locale', languages=['en'], fallback=True)
+    _lang_fr = gettext.translation('tuxeatpi', localedir='tuxeatpi/locale', languages=['fr'])
     # Put languages in dict
     LANGUAGES['eng-USA'] = _lang_en
     LANGUAGES['fra-FRA'] = _lang_fr

diff --git a/locale/en/LC_MESSAGES/tuxeatpi.po → tuxeatpi/locale/en/LC_MESSAGES/tuxeatpi.po b/locale/en/LC_MESSAGES/tuxeatpi.po → tuxeatpi/locale/en/LC_MESSAGES/tuxeatpi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-08-29 23:44-0400\n"
+"POT-Creation-Date: 2016-08-30 17:25-0400\n"
 "PO-Revision-Date: 2016-08-29 23:41-0400\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,11 +17,11 @@ msgstr ""
 "X-Generator: Poedit 1.8.8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tuxeatpi/actions/tux.py:35
+#: tuxeatpi/actions/tux.py:34
 msgid "My name is {}"
 msgstr "My name is {}"
 
-#: tuxeatpi/actions/tux.py:46
+#: tuxeatpi/actions/tux.py:45
 msgid "I'm born on {}"
 msgstr "I'm born on {}"
 

diff --git a/locale/fr/LC_MESSAGES/tuxeatpi.po → tuxeatpi/locale/fr/LC_MESSAGES/tuxeatpi.po b/locale/fr/LC_MESSAGES/tuxeatpi.po → tuxeatpi/locale/fr/LC_MESSAGES/tuxeatpi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-08-29 23:44-0400\n"
+"POT-Creation-Date: 2016-08-30 17:25-0400\n"
 "PO-Revision-Date: 2016-08-29 22:46-0400\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,11 +17,11 @@ msgstr ""
 "X-Generator: Poedit 1.8.8\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tuxeatpi/actions/tux.py:35
+#: tuxeatpi/actions/tux.py:34
 msgid "My name is {}"
 msgstr "Mon nom est {}"
 
-#: tuxeatpi/actions/tux.py:46
+#: tuxeatpi/actions/tux.py:45
 msgid "I'm born on {}"
 msgstr "Je suis né {}"