Merge pull request #52 from eea/fixes

Fixes
eea · May 4, 2017 · fca48f2 · fca48f2
2 parents e5fc479 + 24635ee
commit fca48f2
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 1 deletion.
diff --git a/gemet/local_settings.py.docker b/gemet/local_settings.py.docker
@@ -62,7 +62,7 @@ LOGGING = {
     'loggers': {
         'django': {
             'handlers': ['console'],
-            'level': os.getenv('DJANGO_LOG_LEVEL', 'DEBUG'),
+            'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'),
         },
     },
 }

diff --git a/gemet/thesaurus/collation_charts.py b/gemet/thesaurus/collation_charts.py
@@ -1189,6 +1189,40 @@
         (u"\u10EF", ),
         (u"\u10F0", ),
     ],
+    'is': [
+        (u'a', u'A'),
+        (u'á', u'Á'),
+        (u'b', u'B'),
+        (u'd', u'D'),
+        (u'ð', u'Ð'),
+        (u'e', u'E'),
+        (u'é', u'É'),
+        (u'f', u'F'),
+        (u'g', u'G'),
+        (u'h', u'H'),
+        (u'i', u'I'),
+        (u'í', u'Í'),
+        (u'j', u'J'),
+        (u'k', u'K'),
+        (u'l', u'L'),
+        (u'm', u'M'),
+        (u'n', u'N'),
+        (u'o', u'O'),
+        (u'ó', u'Ó'),
+        (u'p', u'P'),
+        (u'r', u'R'),
+        (u's', u'S'),
+        (u't', u'T'),
+        (u'u', u'U'),
+        (u'ú', u'Ú'),
+        (u'v', u'V'),
+        (u'x', u'X'),
+        (u'y', u'Y'),
+        (u'ý', u'Ý'),
+        (u'þ', u'Þ'),
+        (u'æ', u'Æ'),
+        (u'ö', u'Ö'),
+    ],
 }
 
 if __name__ == '__main__':

diff --git a/gemet/thesaurus/fixtures/data.json b/gemet/thesaurus/fixtures/data.json
@@ -249,6 +249,16 @@
   "code_alt": "ITA"
  }
 },
+{
+ "pk": "is",
+ "model": "thesaurus.language",
+ "fields": {
+  "direction": "0",
+  "charset": "utf8_general_ci",
+  "name": "Icelandic",
+  "code_alt": "ICE"
+ }
+},
 {
  "pk": "lt", 
  "model": "thesaurus.language", 

diff --git a/gemet/thesaurus/templates/changes.html b/gemet/thesaurus/templates/changes.html
@@ -17,7 +17,22 @@ <h1>History of Changes in GEMET</h1>
         <a href="{% url 'download' language.code version %}">Download exports</a>
       </dd>
     {% endfor %}
+    <dt>2015-05-18</dt>
+    <dd>
+       Armenian, Georgian and Azerbaijani added. Definitions translated to Arabic.
 
+    </dd>
+    <dd>
+       The translation of GEMET terms into Armenian (hy), Azerbaijani (az) and Georgian (ka)
+       was done in early 2015, as part of the ENPI-SEIS project.
+       The work and quality assurance was coordinated by the ENPI-SEIS National Focal Points
+       (NFPs) for Armenia, Azerbaijan and Georgia.
+    </dd>
+    <dd>
+       The Centre for Environment and Development for the Arab Region and Europe (CEDARE) completed
+       the translation and quality assurance of all GEMET definitions in Arabic (ar) in early 2015
+       as an activity of the ENPI-SEIS project.
+    </dd>
     <dt>2012-12-11</dt>
     <dd>
     New terms added: