From 1700e273d4e5199c8b432f2900a871101a942e2f Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Mon, 12 Aug 2024 10:44:23 +0200
Subject: [PATCH] adjusted country codes

---
 application/config/gettext.php               | 22 ++++++++++----------
 application/locale/{bs_BA => bs}/index.html  |  0
 application/locale/{hr_HR => cnr}/index.html |  0
 application/locale/{sr_ME => hr}/index.html  |  0
 application/locale/{sr_RS => sr}/index.html  |  0
 install/includes/gettext/gettext_conf.php    | 22 ++++++++++----------
 6 files changed, 22 insertions(+), 22 deletions(-)
 rename application/locale/{bs_BA => bs}/index.html (100%)
 rename application/locale/{hr_HR => cnr}/index.html (100%)
 rename application/locale/{sr_ME => hr}/index.html (100%)
 rename application/locale/{sr_RS => sr}/index.html (100%)

diff --git a/application/config/gettext.php b/application/config/gettext.php
index eea527dff..3b6aac67c 100644
--- a/application/config/gettext.php
+++ b/application/config/gettext.php
@@ -65,8 +65,8 @@ $config['languages'] = array(
 		'name'      => 'Bosanski',
 		'name_en'   => 'Bosnian',
 		'folder'    => 'bosnian',
-		'locale'    => 'bs-BA',
-		'gettext'   => 'bs_BA',
+		'locale'    => 'bs',
+		'gettext'   => 'bs',
 		'direction' => 'ltr',
 		'code'      => 'bs',
 		'flag'      => 'ba',
@@ -95,8 +95,8 @@ $config['languages'] = array(
 		'name'      => 'Hrvatski',
 		'name_en'   => 'Croatian',
 		'folder'    => 'croatian',
-		'locale'    => 'hr-HR',
-		'gettext'   => 'hr_HR',
+		'locale'    => 'hr',
+		'gettext'   => 'hr',
 		'direction' => 'ltr',
 		'code'      => 'hr',
 		'flag'      => 'hr',
@@ -182,13 +182,13 @@ $config['languages'] = array(
 		'flag'      => 'it',
 	),
 	'montenegrin' => array(
-		'name'      => 'Црногорски',
+		'name'      => 'Crnogorski',
 		'name_en'   => 'Montenegrin',
 		'folder'    => 'montenegrin',
-		'locale'    => 'sr-ME',
-		'gettext'   => 'sr_ME',
+		'locale'    => 'cnr',
+		'gettext'   => 'cnr',
 		'direction' => 'ltr',
-		'code'      => 'sr_ME',
+		'code'      => 'cnr',
 		'flag'      => 'me',
 	),
 	'polish' => array(
@@ -222,11 +222,11 @@ $config['languages'] = array(
 		'flag'      => 'ru',
 	),
 	'serbian' => array(
-		'name'      => 'Српски',
+		'name'      => 'Srpski',
 		'name_en'   => 'Serbian',
 		'folder'    => 'serbian',
-		'locale'    => 'sr-RS',
-		'gettext'   => 'sr_RS',
+		'locale'    => 'sr',
+		'gettext'   => 'sr',
 		'direction' => 'ltr',
 		'code'      => 'sr',
 		'flag'      => 'rs',
diff --git a/application/locale/bs_BA/index.html b/application/locale/bs/index.html
similarity index 100%
rename from application/locale/bs_BA/index.html
rename to application/locale/bs/index.html
diff --git a/application/locale/hr_HR/index.html b/application/locale/cnr/index.html
similarity index 100%
rename from application/locale/hr_HR/index.html
rename to application/locale/cnr/index.html
diff --git a/application/locale/sr_ME/index.html b/application/locale/hr/index.html
similarity index 100%
rename from application/locale/sr_ME/index.html
rename to application/locale/hr/index.html
diff --git a/application/locale/sr_RS/index.html b/application/locale/sr/index.html
similarity index 100%
rename from application/locale/sr_RS/index.html
rename to application/locale/sr/index.html
diff --git a/install/includes/gettext/gettext_conf.php b/install/includes/gettext/gettext_conf.php
index de25bb1dd..48c49f009 100644
--- a/install/includes/gettext/gettext_conf.php
+++ b/install/includes/gettext/gettext_conf.php
@@ -20,8 +20,8 @@ $gt_conf['languages'] = array(
 		'name'      => 'Bosanski',
 		'name_en'   => 'Bosnian',
 		'folder'    => 'bosnian',
-		'locale'    => 'bs-BA',
-		'gettext'   => 'bs_BA',
+		'locale'    => 'bs',
+		'gettext'   => 'bs',
 		'direction' => 'ltr',
 		'code'      => 'bs',
 		'flag'      => 'ba',
@@ -50,8 +50,8 @@ $gt_conf['languages'] = array(
 		'name'      => 'Hrvatski',
 		'name_en'   => 'Croatian',
 		'folder'    => 'croatian',
-		'locale'    => 'hr-HR',
-		'gettext'   => 'hr_HR',
+		'locale'    => 'hr',
+		'gettext'   => 'hr',
 		'direction' => 'ltr',
 		'code'      => 'hr',
 		'flag'      => 'hr',
@@ -137,13 +137,13 @@ $gt_conf['languages'] = array(
 		'flag'      => 'it',
 	),
 	'montenegrin' => array(
-		'name'      => 'Црногорски',
+		'name'      => 'Crnogorski',
 		'name_en'   => 'Montenegrin',
 		'folder'    => 'montenegrin',
-		'locale'    => 'sr-ME',
-		'gettext'   => 'sr_ME',
+		'locale'    => 'cnr',
+		'gettext'   => 'cnr',
 		'direction' => 'ltr',
-		'code'      => 'sr_ME',
+		'code'      => 'cnr',
 		'flag'      => 'me',
 	),
 	'polish' => array(
@@ -177,11 +177,11 @@ $gt_conf['languages'] = array(
 		'flag'      => 'ru',
 	),
 	'serbian' => array(
-		'name'      => 'Српски',
+		'name'      => 'Srpski',
 		'name_en'   => 'Serbian',
 		'folder'    => 'serbian',
-		'locale'    => 'sr-RS',
-		'gettext'   => 'sr_RS',
+		'locale'    => 'sr',
+		'gettext'   => 'sr',
 		'direction' => 'ltr',
 		'code'      => 'sr',
 		'flag'      => 'rs',