wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch for sr-Latn-{CS,RS} locale definitions.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-05-15 00:11:30 +02:00
parent 27ba45e053
commit 131c688ab3
4 changed files with 278 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
patches/kernel32-Locale_Definitions/0001-kernel32-Update-sr-Latn-locale-definition.patch Normal file
View File

@ -0,0 +1,63 @@
From c28cdfe81ad11729cbfe912ee25f5d7062ef880d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 13 May 2016 17:54:12 +0200
Subject: kernel32: Update sr-Latn locale definition.
---
dlls/kernel32/nls/srl.nls | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls
index a40556c..1cd21db 100644
--- a/dlls/kernel32/nls/srl.nls
+++ b/dlls/kernel32/nls/srl.nls
@@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_ITLZERO "0"
LOCALE_S1159 ""
LOCALE_S2359 ""
- LOCALE_SABBREVCTRYNAME "SPB"
+ LOCALE_SABBREVCTRYNAME "SCG"
LOCALE_SABBREVDAYNAME1 "pon"
LOCALE_SABBREVDAYNAME2 "uto"
LOCALE_SABBREVDAYNAME3 "sre"
@@ -86,7 +86,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SABBREVMONTHNAME11 "nov"
LOCALE_SABBREVMONTHNAME12 "dec"
LOCALE_SABBREVMONTHNAME13 ""
- LOCALE_SCOUNTRY "Serbia"
+ LOCALE_SCOUNTRY "Serbia and Montenegro (Former)"
LOCALE_SCURRENCY "Din."
LOCALE_SDATE "."
LOCALE_SDAYNAME1 "ponedeljak"
@@ -97,14 +97,14 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SDAYNAME6 "subota"
LOCALE_SDAYNAME7 "nedelja"
LOCALE_SDECIMAL ","
- LOCALE_SENGCOUNTRY "Serbia"
+ LOCALE_SENGCOUNTRY "Serbia and Montenegro (Former)"
LOCALE_SENGCURRNAME "Serbian Dinar"
LOCALE_SENGLANGUAGE "Serbian (Latin)"
LOCALE_SGROUPING "3;0"
LOCALE_SINTLSYMBOL "RSD"
- LOCALE_SISO3166CTRYNAME "RS"
+ LOCALE_SISO3166CTRYNAME "CS"
LOCALE_SISO639LANGNAME "sr"
- LOCALE_SLANGUAGE "Serbian (Latin)"
+ LOCALE_SLANGUAGE "Serbian (Latin, Serbia and Montenegro (Former))"
LOCALE_SLIST ";"
LOCALE_SLONGDATE "d. MMMM yyyy"
LOCALE_SMONDECIMALSEP ","
@@ -123,8 +123,8 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SMONTHNAME12 "decembar"
LOCALE_SMONTHNAME13 ""
LOCALE_SMONTHOUSANDSEP "."
- LOCALE_SNAME "sr-Latn-RS"
- LOCALE_SNATIVECTRYNAME "Srbija"
+ LOCALE_SNAME "sr-Latn-CS"
+ LOCALE_SNATIVECTRYNAME "Srbija i Crna Gora (Bivši)"
LOCALE_SNATIVECURRNAME "dinar"
LOCALE_SNATIVEDIGITS "0123456789"
LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)"
--
2.8.0

193
patches/kernel32-Locale_Definitions/0002-kernel32-Add-sr-Latn-RS-locale-definition.patch Normal file
View File

@ -0,0 +1,193 @@
From 61531ffe85ccac683fd6b2904b8b03a4eef0fe92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 13 May 2016 17:55:15 +0200
Subject: kernel32: Add sr-Latn-RS locale definition.
---
dlls/kernel32/locale_rc.rc | 1 +
dlls/kernel32/nls/srsl.nls | 161 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 162 insertions(+)
create mode 100644 dlls/kernel32/nls/srsl.nls
diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc
index 363e7ab..5673c30 100644
--- a/dlls/kernel32/locale_rc.rc
+++ b/dlls/kernel32/locale_rc.rc
@@ -143,6 +143,7 @@
#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */
#include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */
#include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */
+#include "nls/srsl.nls" /* 0x241a LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN */
#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */
diff --git a/dlls/kernel32/nls/srsl.nls b/dlls/kernel32/nls/srsl.nls
new file mode 100644
index 0000000..f4d8e57
--- /dev/null
+++ b/dlls/kernel32/nls/srsl.nls
@@ -0,0 +1,161 @@
+/*
+ * Locale definitions for Serbian (Serbia, Latin)
+ *
+ * Copyright 2016 Michael Müller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#pragma code_page(65001) /* UTF-8 */
+
+STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN
+{
+ LOCALE_FONTSIGNATURE L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0400\x0012\x0000\x0000\xc5d4"
+ LOCALE_ICALENDARTYPE "1"
+ LOCALE_ICENTURY "1"
+ LOCALE_ICOUNTRY "381"
+ LOCALE_ICURRDIGITS "2"
+ LOCALE_ICURRENCY "3"
+ LOCALE_IDATE "1"
+ LOCALE_IDAYLZERO "0"
+ LOCALE_IDEFAULTANSICODEPAGE "1250"
+ LOCALE_IDEFAULTCODEPAGE "852"
+ LOCALE_IDEFAULTCOUNTRY "381"
+ LOCALE_IDEFAULTEBCDICCODEPAGE "500"
+ LOCALE_IDEFAULTLANGUAGE "241a"
+ LOCALE_IDEFAULTMACCODEPAGE "10029"
+ LOCALE_IDEFAULTUNIXCODEPAGE "28592"
+ LOCALE_IDIGITS "2"
+ LOCALE_IDIGITSUBSTITUTION "1"
+ LOCALE_IFIRSTDAYOFWEEK "0"
+ LOCALE_IFIRSTWEEKOFYEAR "0"
+ LOCALE_IINTLCURRDIGITS "2"
+ LOCALE_ILANGUAGE "241a"
+ LOCALE_ILDATE "1"
+ LOCALE_ILZERO "1"
+ LOCALE_IMEASURE "0"
+ LOCALE_IMONLZERO "0"
+ LOCALE_INEGCURR "8"
+ LOCALE_INEGNUMBER "1"
+ LOCALE_INEGSEPBYSPACE "1"
+ LOCALE_INEGSIGNPOSN "1"
+ LOCALE_INEGSYMPRECEDES "0"
+ LOCALE_INEUTRAL "0"
+ LOCALE_IOPTIONALCALENDAR "0"
+ LOCALE_IPAPERSIZE "9"
+ LOCALE_IPOSSEPBYSPACE "1"
+ LOCALE_IPOSSIGNPOSN "1"
+ LOCALE_IPOSSYMPRECEDES "0"
+ LOCALE_IREADINGLAYOUT "0"
+ LOCALE_ITIME "1"
+ LOCALE_ITIMEMARKPOSN "0"
+ LOCALE_ITLZERO "1"
+ LOCALE_S1159 "pre podne"
+ LOCALE_S2359 "po podne"
+ LOCALE_SABBREVCTRYNAME "SRB"
+ LOCALE_SABBREVDAYNAME1 "pon"
+ LOCALE_SABBREVDAYNAME2 "uto"
+ LOCALE_SABBREVDAYNAME3 "sre"
+ LOCALE_SABBREVDAYNAME4 "čet"
+ LOCALE_SABBREVDAYNAME5 "pet"
+ LOCALE_SABBREVDAYNAME6 "sub"
+ LOCALE_SABBREVDAYNAME7 "ned"
+ LOCALE_SABBREVLANGNAME "SRM"
+ LOCALE_SABBREVMONTHNAME1 "jan"
+ LOCALE_SABBREVMONTHNAME2 "feb"
+ LOCALE_SABBREVMONTHNAME3 "mar"
+ LOCALE_SABBREVMONTHNAME4 "apr"
+ LOCALE_SABBREVMONTHNAME5 "maj"
+ LOCALE_SABBREVMONTHNAME6 "jun"
+ LOCALE_SABBREVMONTHNAME7 "jul"
+ LOCALE_SABBREVMONTHNAME8 "avg"
+ LOCALE_SABBREVMONTHNAME9 "sep"
+ LOCALE_SABBREVMONTHNAME10 "okt"
+ LOCALE_SABBREVMONTHNAME11 "nov"
+ LOCALE_SABBREVMONTHNAME12 "dec"
+ LOCALE_SABBREVMONTHNAME13 ""
+ LOCALE_SCOUNTRY "Serbia"
+ LOCALE_SCURRENCY "RSD"
+ LOCALE_SDATE "."
+ LOCALE_SDAYNAME1 "ponedeljak"
+ LOCALE_SDAYNAME2 "utorak"
+ LOCALE_SDAYNAME3 "sreda"
+ LOCALE_SDAYNAME4 "četvrtak"
+ LOCALE_SDAYNAME5 "petak"
+ LOCALE_SDAYNAME6 "subota"
+ LOCALE_SDAYNAME7 "nedelja"
+ LOCALE_SDECIMAL ","
+ LOCALE_SENGCOUNTRY "Serbia"
+ LOCALE_SENGCURRNAME "Serbian Dinar"
+ LOCALE_SENGLANGUAGE "Serbian (Latin)"
+ LOCALE_SGROUPING "3;0"
+ LOCALE_SINTLSYMBOL "RSD"
+ LOCALE_SISO3166CTRYNAME "RS"
+ LOCALE_SISO639LANGNAME "sr"
+ LOCALE_SLANGUAGE "Serbian (Latin, Serbia)"
+ LOCALE_SLIST ";"
+ LOCALE_SLONGDATE "dddd, dd. MMMM yyyy"
+ LOCALE_SMONDECIMALSEP ","
+ LOCALE_SMONGROUPING "3;0"
+ LOCALE_SMONTHNAME1 "januar"
+ LOCALE_SMONTHNAME2 "februar"
+ LOCALE_SMONTHNAME3 "mart"
+ LOCALE_SMONTHNAME4 "april"
+ LOCALE_SMONTHNAME5 "maj"
+ LOCALE_SMONTHNAME6 "jun"
+ LOCALE_SMONTHNAME7 "jul"
+ LOCALE_SMONTHNAME8 "avgust"
+ LOCALE_SMONTHNAME9 "septembar"
+ LOCALE_SMONTHNAME10 "oktobar"
+ LOCALE_SMONTHNAME11 "novembar"
+ LOCALE_SMONTHNAME12 "decembar"
+ LOCALE_SMONTHNAME13 ""
+ LOCALE_SMONTHOUSANDSEP "."
+ LOCALE_SNAME "sr-Latn-RS"
+ LOCALE_SNATIVECTRYNAME "Srbija"
+ LOCALE_SNATIVECURRNAME "Srpski dinar"
+ LOCALE_SNATIVEDIGITS "0123456789"
+ LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)"
+ LOCALE_SNATIVELANGNAME "srpski"
+ LOCALE_SNEGATIVESIGN "-"
+ LOCALE_SOPENTYPELANGUAGETAG "SRB "
+ LOCALE_SPOSITIVESIGN "+"
+ LOCALE_SSCRIPTS "Latn;"
+ LOCALE_SSHORTDATE "d.M.yyyy"
+ LOCALE_SSHORTTIME "H:mm"
+ LOCALE_SSORTNAME "Default"
+ LOCALE_STHOUSAND "."
+ LOCALE_STIME ":"
+ LOCALE_STIMEFORMAT "H:mm:ss"
+ LOCALE_SYEARMONTH "MMMM yyyy"
+
+ LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States"
+ LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe"
+ LGRPID_BALTIC+LGRPID_RES_BASE "Baltic"
+ LGRPID_GREEK+LGRPID_RES_BASE "Greek"
+ LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic"
+ LGRPID_TURKISH+LGRPID_RES_BASE "Turkic"
+ LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese"
+ LGRPID_KOREAN+LGRPID_RES_BASE "Korean"
+ LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese"
+ LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese"
+ LGRPID_THAI+LGRPID_RES_BASE "Thai"
+ LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew"
+ LGRPID_ARABIC+LGRPID_RES_BASE "Arabic"
+ LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese"
+ LGRPID_INDIC+LGRPID_RES_BASE "Indic"
+ LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian"
+ LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian"
+}
--
2.8.0

1
patches/kernel32-Locale_Definitions/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [40619] Add sr-Latn-RS locale definition

21
patches/patchinstall.sh
View File

@ -168,6 +168,7 @@ patch_enable_all ()
enable_kernel32_GetCurrentPackageFamilyName="$1"
enable_kernel32_GetShortPathName="$1"
enable_kernel32_LocaleNameToLCID="$1"
enable_kernel32_Locale_Definitions="$1"
enable_kernel32_Misalign_Workaround="$1"
enable_kernel32_Named_Pipe="$1"
enable_kernel32_NeedCurrentDirectoryForExePath="$1"
@ -673,6 +674,9 @@ patch_enable ()
kernel32-LocaleNameToLCID)
enable_kernel32_LocaleNameToLCID="$2"
;;
kernel32-Locale_Definitions)
enable_kernel32_Locale_Definitions="$2"
;;
kernel32-Misalign_Workaround)
enable_kernel32_Misalign_Workaround="$2"
;;
@ -4019,6 +4023,23 @@ if test "$enable_kernel32_LocaleNameToLCID" -eq 1; then
) >> "$patchlist"
fi
# Patchset kernel32-Locale_Definitions
# |
# | This patchset fixes the following Wine bugs:
# | * [#40619] Add sr-Latn-RS locale definition
# |
# | Modified files:
# | * dlls/kernel32/locale_rc.rc, dlls/kernel32/nls/srl.nls, dlls/kernel32/nls/srsl.nls
# |
if test "$enable_kernel32_Locale_Definitions" -eq 1; then
patch_apply kernel32-Locale_Definitions/0001-kernel32-Update-sr-Latn-locale-definition.patch
patch_apply kernel32-Locale_Definitions/0002-kernel32-Add-sr-Latn-RS-locale-definition.patch
(
echo '+ { "Michael Müller", "kernel32: Update sr-Latn locale definition.", 1 },';
echo '+ { "Michael Müller", "kernel32: Add sr-Latn-RS locale definition.", 1 },';
) >> "$patchlist"
fi
# Patchset kernel32-Misalign_Workaround
# |
# | This patchset fixes the following Wine bugs: