1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
--- src/fclang.c.orig 2020-11-28 01:56:42 UTC
+++ src/fclang.c
@@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang)
{
FcChar8 *result = NULL, *s, *orig;
char *territory, *encoding, *modifier;
+ char *script;
size_t llen, tlen = 0, mlen = 0;
if (!lang || !*lang)
@@ -246,27 +247,33 @@ FcLangNormalize (const FcChar8 *lang)
modifier = encoding;
}
}
- territory = strchr ((const char *) s, '_');
- if (!territory)
- territory = strchr ((const char *) s, '-');
+ territory = strrchr ((const char *) s, '_');
if (territory)
{
*territory = 0;
territory++;
tlen = strlen (territory);
}
+ /* There might by a script component, e.g. sr_Cyrl_RS@UTF-8. We can't assume all legal locale
+ names are in the form <lang>_<country code>.<encoding>. If the script component is here,
+ skip it to define the language properly (e.g. "sr" instead of "sr_Cyrl") */
+ script = strchr ((const char *) s, '_');
+ if (script)
+ {
+ *script = 0;
+ }
llen = strlen ((const char *) s);
if (llen < 2 || llen > 3)
{
- fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid language tag\n",
- lang);
+ fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid language tag (%s)\n",
+ s, lang);
goto bail0;
}
if (territory && (tlen < 2 || tlen > 3) &&
!(territory[0] == 'z' && tlen < 5))
{
- fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag\n",
- lang);
+ fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag (%s)\n",
+ territory, lang);
goto bail0;
}
if (territory)
|
