Fix admin, enable more parler languages

nextcloud · Jun 23, 2016 · a47f6ce · a47f6ce
1 parent 4499d93
commit a47f6ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/nextcloudappstore/core/models.py b/nextcloudappstore/core/models.py
@@ -208,9 +208,8 @@ class Meta:
         unique_together = (('app_release', 'database', 'version_spec'),)
 
     def __str__(self) -> str:
-        return '%s: %s >=%s, <=%s' % (self.app_release, self.database,
-                                      self.min_version,
-                                      self.max_version)
+        return '%s: %s %s' % (self.app_release, self.database,
+                                      self.version_spec)
 
 
 class PhpExtension(Model):
@@ -241,6 +240,5 @@ class Meta:
         unique_together = (('app_release', 'php_extension', 'version_spec'),)
 
     def __str__(self) -> str:
-        return '%s: %s >=%s, <=%s' % (self.app_release.app, self.php_extension,
-                                      self.min_version,
-                                      self.max_version)
+        return '%s: %s %s' % (self.app_release.app, self.php_extension,
+                                      self.version_spec)
diff --git a/nextcloudappstore/settings.py b/nextcloudappstore/settings.py
@@ -13,6 +13,8 @@
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+from django.conf.global_settings import LANGUAGES
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # Quick-start development settings - unsuitable for production
@@ -148,11 +150,7 @@
 USE_TZ = True
 
 PARLER_LANGUAGES = {
-    1: (
-        {'code': 'en'},
-        {'code': 'de'},
-        {'code': 'fr'},
-    ),
+    1: [{'code': code} for code, trans in LANGUAGES],
     'default': {
         'fallbacks': ['en'],
         'hide_untranslated': False,