GUI-1081

move locale dir to top level out of necessity. move locale files to /usr/share/locale for install, fix build to refer to new locale dir. tell pyramid to look for files in /usr/share/locale

eucaconsole/config.py

@@ -70,6 +70,7 @@ def get_configurator(settings, enable_auth=True):
                       'eucaconsole.layout:templates/master_layout.pt')
     config.add_translation_dirs('eucaconsole:locale')
     config.set_locale_negotiator(custom_locale_negotiator)
+    config.add_translation_dirs('/usr/share/locale')
     for route in urls:
         config.add_route(route.name, route.pattern)
     setup_tweens(config)

setup.cfg

@@ -6,22 +6,22 @@ with-coverage = 1
 cover-erase = 1
 
 [compile_catalog]
-directory = eucaconsole/locale
+directory = locale
 domain = eucaconsole
 statistics = true
 
 [extract_messages]
 add_comments = TRANSLATORS:
-output_file = eucaconsole/locale/eucaconsole.pot
+output_file = locale/eucaconsole.pot
 width = 80
 
 [init_catalog]
 domain = eucaconsole
-input_file = eucaconsole/locale/eucaconsole.pot
-output_dir = eucaconsole/locale
+input_file = locale/eucaconsole.pot
+output_dir = locale
 
 [update_catalog]
 domain = eucaconsole
-input_file = eucaconsole/locale/eucaconsole.pot
-output_dir = eucaconsole/locale
+input_file = locale/eucaconsole.pot
+output_dir = locale
 previous = true

setup.py

@@ -31,20 +31,19 @@
 
 from eucaconsole import __version__
 
-DATA_DIR='./'
+DATA_DIR='/usr/share/'
 
 def get_data_files(path):
-    data_files = {}
+    data_files = []
     for root, _, filenames in os.walk(path, followlinks=True):
-        data_file_dir = os.path.join(DATA_DIR, root)
-        for filename in filenames:
-            data_files.setdefault(data_file_dir, [])
-            data_files[data_file_dir].append(os.path.join(root, filename))
-    return list(data_files.items())
+        files = []
+        for file in filenames:
+            files.append(os.path.join(root, file))
+        data_files.append((os.path.join(DATA_DIR, root), files))
+    print "data_files = "+str(data_files)
+    return data_files
 
 
-DATA_FILES = get_data_files("eucaconsole/locale")
-
 here = os.path.abspath(os.path.dirname(__file__))
 with open(os.path.join(here, 'README.rst')) as f:
     README = f.read()
@@ -151,7 +150,7 @@ def make_release_tree(self, base_dir, files):
         'dev': dev_extras,
     },
     message_extractors=message_extractors,
-    data_files=DATA_FILES,
+    data_files=get_data_files("locale"),
     test_suite="tests",
     entry_points="""\
     [paste.app_factory]