Merge branch 'build_types' into 'devel'

Build types

See merge request !7

core/src/cz/nic/tablexia/TablexiaSettings.java

@@ -22,7 +22,7 @@ public class TablexiaSettings {
     private final           BuildType   BUILD_TYPE;
 
     private                 Preferences         preferences;
-    private                 Locale              systemLocale;
+    private                 LocaleDefinition    systemLocale;
     private                 LocaleDefinition    selectedLocale;
 
 
@@ -85,7 +85,7 @@ public class TablexiaSettings {
         }
 
         public Locale getLocale() {
-            return locale != null ? locale : instance.systemLocale;
+            return locale != null ? locale : instance.systemLocale.locale;
         }
 
         @Override
@@ -105,6 +105,15 @@ public class TablexiaSettings {
             }
             return FALLBACK_VARIANT;
         }
+
+        public static LocaleDefinition getLocaleDefinitionForLocale(Locale locale) {
+            for(LocaleDefinition localeDefinition: LocaleDefinition.values()) {
+                if (localeDefinition.locale != null && localeDefinition.locale.equals(locale)) {
+                    return localeDefinition;
+                }
+            }
+            return DEFAULT_LOCALE;
+        }
     }
 
 
@@ -114,7 +123,7 @@ public class TablexiaSettings {
 
     private TablexiaSettings(BuildType buildType, Locale systemLocale) {
         BUILD_TYPE          = buildType;
-        this.systemLocale   = systemLocale;
+        this.systemLocale   = LocaleDefinition.getLocaleDefinitionForLocale(systemLocale);
     }
 
     public static TablexiaSettings getInstance() {