From 310898270787c1a3a6ab50221324f8654dddce8e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 20 Oct 2022 07:10:58 +0000 Subject: nls: Map sr locales to sr_RS compose files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Serbian used sr_YU (Yugoslavia) code in the past. Then it was succeeded by sr_CS (Serbia and Montenegro). Finally, it was split into sr_RS (Serbia) and sr_ME (Montenegro). https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/da95ecbbdcacc483cd0b5fd7db1fb2e2543341bd introduced the modern sr_RS and sr_ME codes. Next, https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/40761898692e5063957bfa2518cca3d35b2e354a added the Serbian compose table but only for the legacy sr_CS entry. https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/5cd60398b7787297008b13a848ed3cfbd7ef178d removed the legacy sr_CS entry, the only one pointing to the correct compose file. It also renamed the file to sr_RS, but did not update the compose mapping. Let’s point all Serbian locales to the Compose file again. --- nls/compose.dir.pre | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre index 4ce1ee34..89239453 100644 --- a/nls/compose.dir.pre +++ b/nls/compose.dir.pre @@ -430,8 +430,8 @@ en_US.UTF-8/Compose: si_LK.UTF-8 en_US.UTF-8/Compose: sk_SK.UTF-8 en_US.UTF-8/Compose: sl_SI.UTF-8 en_US.UTF-8/Compose: sq_AL.UTF-8 -en_US.UTF-8/Compose: sr_ME.UTF-8 -en_US.UTF-8/Compose: sr_RS.UTF-8 +sr_RS.UTF-8/Compose: sr_ME.UTF-8 +sr_RS.UTF-8/Compose: sr_RS.UTF-8 en_US.UTF-8/Compose: ss_ZA.UTF-8 en_US.UTF-8/Compose: st_ZA.UTF-8 en_US.UTF-8/Compose: sv_FI.UTF-8 -- cgit v1.2.1