summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-04-26 12:24:56 +1000
committerDaniel Black <daniel@mariadb.org>2022-04-26 13:31:41 +1000
commit551e7814ed0cde2d8696ce228c7e9c6ee1a64696 (patch)
tree8c19e4885794820a1928950ccd1c1be6c450c930
parentd16c3aca3c3ecd1050b2527c213f4fdf1959d9e2 (diff)
downloadmariadb-git-551e7814ed0cde2d8696ce228c7e9c6ee1a64696.tar.gz
MDEV-28227 Chinese translation postfix
Add chinese language to missing sql/share/CMakeLists.txt that results in installed files. Also add bulgarian=bgn which has existing for a long time. Sort both lists properly. Append both to debian/mariadb-server-core-10.4 too.
-rw-r--r--debian/mariadb-server-core-10.4.install2
-rw-r--r--sql/share/CMakeLists.txt30
-rw-r--r--sql/share/errmsg-utf8.txt2
3 files changed, 19 insertions, 15 deletions
diff --git a/debian/mariadb-server-core-10.4.install b/debian/mariadb-server-core-10.4.install
index 9139949a24e..36c62a29895 100644
--- a/debian/mariadb-server-core-10.4.install
+++ b/debian/mariadb-server-core-10.4.install
@@ -9,6 +9,8 @@ usr/share/man/man1/mysql_install_db.1
usr/share/man/man1/mysql_upgrade.1
usr/share/man/man8/mariadbd.8
usr/share/man/man8/mysqld.8
+usr/share/mysql/bulgarian
+usr/share/mysql/chinese
usr/share/mysql/charsets
usr/share/mysql/czech
usr/share/mysql/danish
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt
index 55f39e5e22b..ddb813057ab 100644
--- a/sql/share/CMakeLists.txt
+++ b/sql/share/CMakeLists.txt
@@ -15,30 +15,32 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
SET (dirs
+bulgarian
+chinese
+czech
danish
-german
-slovak
dutch
-greek
-norwegian
-spanish
english
+estonian
+french
+german
+greek
+hindi
hungarian
-norwegian-ny
-swedish
italian
-polish
-ukrainian
japanese
+korean
+norwegian-ny
+norwegian
+polish
portuguese
romanian
-estonian
-korean
russian
-czech
-french
serbian
-hindi
+slovak
+spanish
+swedish
+ukrainian
)
SET(files
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 4fe847fd4bb..ebebb4824cd 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -1,4 +1,4 @@
-languages chinese=chi gbk, czech=cze latin2, danish=dan latin1, dutch=nla latin1, english=eng latin1, estonian=est latin7, french=fre latin1, german=ger latin1, greek=greek greek, hungarian=hun latin2, italian=ita latin1, japanese=jpn ujis, korean=kor euckr, norwegian-ny=norwegian-ny latin1, norwegian=nor latin1, polish=pol latin2, portuguese=por latin1, romanian=rum latin2, russian=rus koi8r, serbian=serbian cp1250, slovak=slo latin2, spanish=spa latin1, swedish=swe latin1, ukrainian=ukr koi8u, bulgarian=bgn cp1251, hindi=hindi utf8;
+languages bulgarian=bgn cp1251, chinese=chi gbk, czech=cze latin2, danish=dan latin1, dutch=nla latin1, english=eng latin1, estonian=est latin7, french=fre latin1, german=ger latin1, greek=greek greek, hindi=hindi utf8, hungarian=hun latin2, italian=ita latin1, japanese=jpn ujis, korean=kor euckr, norwegian-ny=norwegian-ny latin1, norwegian=nor latin1, polish=pol latin2, portuguese=por latin1, romanian=rum latin2, russian=rus koi8r, serbian=serbian cp1250, slovak=slo latin2, spanish=spa latin1, swedish=swe latin1, ukrainian=ukr koi8u;
default-language eng