gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-24 01:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore Canonical names of gnustep extension encodings

Browse source
This commit is contained in:
Richard Frith-Macdonald 2022-01-04 12:46:56 +00:00
parent 81ad2f403b
commit cc38a942f2
13 changed files with 79 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,8 +1,19 @@
2021-01-04 Richard Frith-Macdonald <rfm@gnu.org>
2022-01-04 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSString.h:
* Source/Additions/GSMime.m:
* Source/Additions/Unicode.m:
* Resources/English.lproj/Localizable.strings:
* Resources/Esperanto.lproj/Localizable.strings:
* Resources/French.lproj/Localizable.strings:
* Resources/German.lproj/Localizable.strings:
* Resources/Italian.lproj/Localizable.strings:
* Resources/Japanese.lproj/Localizable.strings:
* Resources/Korean.lproj/Localizable.strings:
* Resources/Polish.lproj/Localizable.strings:
* Resources/SimplifiedChinese.lproj/Localizable.strings:
* Resources/Spanish.lproj/Localizable.strings:
* Resources/TraditionalChinese.lproj/Localizable.strings:
Reinstate lost encoding constants (so that software using the
gnustep extenstions should work again). Also tidy some indentation
issues.

10
Resources/English.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "Western (Mac OS Roman)";
NSUTF7StringEncoding = "Unicode (UTF-7)";
NSISOLatin3StringEncoding = "Western (ISO Latin 3)";
NSISOLatin4StringEncoding = "Central European (ISO Latin 4)";
NSISOLatinCyrillicStringEncoding = "Cyrillic (ISO 8859-5)";
NSISOLatinArabicStringEncoding = "Arabic (ISO 8859-6)";
NSISOLatinGreekStringEncoding = "Greek (ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "Hebrew (ISO 8859-8)";
NSISOCyrillicStringEncoding = "Cyrillic (ISO 8859-5)";
NSISOArabicStringEncoding = "Arabic (ISO 8859-6)";
NSISOGreekStringEncoding = "Greek (ISO 8859-7)";
NSISOHebrewStringEncoding = "Hebrew (ISO 8859-8)";
NSISOLatin5StringEncoding = "Turkish (ISO Latin 5)";
NSISOLatin6StringEncoding = "Nordic (ISO Latin 6)";
NSISOLatinThaiStringEncoding = "Thai (ISO 8859-11)";
NSISOThaiStringEncoding = "Thai (ISO 8859-11)";
NSISOLatin7StringEncoding = "Baltic (ISO Latin 7)";
NSISOLatin8StringEncoding = "Celtic (ISO Latin 8)";
NSISOLatin9StringEncoding = "Western (ISO Latin 9)";

8
Resources/Esperanto.lproj/Localizable.strings
View file

@ -20,10 +20,10 @@ NSISOLatin6StringEncoding = "ISO Latin-6 Norda (ISO-8859-10)";
NSISOLatin7StringEncoding = "ISO Latin-7 Balta (ISO-8859-13)";
NSISOLatin8StringEncoding = "ISO Latin-8 Kelta (ISO-8859-14)";
NSISOLatin9StringEncoding = "ISO Latin-9 Okcidenteŭropa (nova) (ISO-8859-15)";
NSISOLatinCyrillicStringEncoding = "Kirila (ISO-8859-5)";
NSISOLatinArabicStringEncoding = "Araba (ISO-8859-6)";
NSISOLatinGreekStringEncoding = "Greka (ISO-8859-7)";
NSISOLatinHebrewStringEncoding = "Hebrea (ISO-8859-8)";
NSISOCyrillicStringEncoding = "Kirila (ISO-8859-5)";
NSISOArabicStringEncoding = "Araba (ISO-8859-6)";
NSISOGreekStringEncoding = "Greka (ISO-8859-7)";
NSISOHebrewStringEncoding = "Hebrea (ISO-8859-8)";
NSUTF7StringEncoding = "Unikodo UTF-7 (RFC 2152)";
NSUTF8StringEncoding = "Unikodo UTF-8";
NSUnicodeStringEncoding = "Unikodo UTF-16";

10
Resources/French.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "Occidental (Mac OS Roman)";
NSUTF7StringEncoding = "Unicode (UTF-7)";
NSISOLatin3StringEncoding = "Occidental (ISO Latin 3)";
NSISOLatin4StringEncoding = "Europe centrale (ISO Latin 4)";
NSISOLatinCyrillicStringEncoding = "Cyrillique (ISO 8859-5)";
NSISOLatinArabicStringEncoding = "Arabe (ISO 8859-6)";
NSISOLatinGreekStringEncoding = "Grec (ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "Hébreu (ISO 8859-8)";
NSISOCyrillicStringEncoding = "Cyrillique (ISO 8859-5)";
NSISOArabicStringEncoding = "Arabe (ISO 8859-6)";
NSISOGreekStringEncoding = "Grec (ISO 8859-7)";
NSISOHebrewStringEncoding = "Hébreu (ISO 8859-8)";
NSISOLatin5StringEncoding = "Turc (ISO Latin 5)";
NSISOLatin6StringEncoding = "Nordique (ISO Latin 6)";
NSISOLatinThaiStringEncoding = "Thaïlandais (ISO 8859-11)";
NSISOThaiStringEncoding = "Thaïlandais (ISO 8859-11)";
NSISOLatin7StringEncoding = "Balte (ISO Latin 7)";
NSISOLatin8StringEncoding = "Celtique (ISO Latin 8)";
NSISOLatin9StringEncoding = "Occidental (ISO Latin 9)";

10
Resources/German.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "Westeuropäisch (Mac OS Roman)";
NSUTF7StringEncoding = "Unicode (UTF-7)";
NSISOLatin3StringEncoding = "Westeuropäisch (ISO Latin 3)";
NSISOLatin4StringEncoding = "Mitteleuropäisch (ISO Latin 4)";
NSISOLatinCyrillicStringEncoding = "Kyrillisch (ISO 8859-5)";
NSISOLatinArabicStringEncoding = "Arabisch (ISO 8859-6)";
NSISOLatinGreekStringEncoding = "Griechisch (ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "Hebräisch (ISO 8859-8)";
NSISOCyrillicStringEncoding = "Kyrillisch (ISO 8859-5)";
NSISOArabicStringEncoding = "Arabisch (ISO 8859-6)";
NSISOGreekStringEncoding = "Griechisch (ISO 8859-7)";
NSISOHebrewStringEncoding = "Hebräisch (ISO 8859-8)";
NSISOLatin5StringEncoding = "Türkisch (ISO Latin 5)";
NSISOLatin6StringEncoding = "Nordisch (ISO Latin 6)";
NSISOLatinThaiStringEncoding = "Thailändisch (ISO 8859-11)";
NSISOThaiStringEncoding = "Thailändisch (ISO 8859-11)";
NSISOLatin7StringEncoding = "Baltisch (ISO Latin 7)";
NSISOLatin8StringEncoding = "Keltisch (ISO Latin 8)";
NSISOLatin9StringEncoding = "Westeuropäisch (ISO Latin 9)";

10
Resources/Italian.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "Occidentale (Mac OS Roman)";
NSUTF7StringEncoding = "Unicode (UTF-7)";
NSISOLatin3StringEncoding = "Occidentale (ISO latino 3)";
NSISOLatin4StringEncoding = "Centroeuropeo (ISO latino 4)";
NSISOLatinCyrillicStringEncoding = "Cirillico (ISO 8859-5)";
NSISOLatinArabicStringEncoding = "Arabo (ISO 8859-6)";
NSISOLatinGreekStringEncoding = "Greco (ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "Ebraico (ISO 8859-8)";
NSISOCyrillicStringEncoding = "Cirillico (ISO 8859-5)";
NSISOArabicStringEncoding = "Arabo (ISO 8859-6)";
NSISOGreekStringEncoding = "Greco (ISO 8859-7)";
NSISOHebrewStringEncoding = "Ebraico (ISO 8859-8)";
NSISOLatin5StringEncoding = "Turco (ISO latino 5)";
NSISOLatin6StringEncoding = "Nordico (ISO latino 6)";
NSISOLatinThaiStringEncoding = "Tailandese (ISO 8859-11)";
NSISOThaiStringEncoding = "Tailandese (ISO 8859-11)";
NSISOLatin7StringEncoding = "Baltico (ISO latino 7)";
NSISOLatin8StringEncoding = "Celtico (ISO latino 8)";
NSISOLatin9StringEncoding = "Occidentale (ISO latino 9)";

10
Resources/Japanese.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "欧米（Mac OS Roman）";
NSUTF7StringEncoding = "Unicode（UTF-7）";
NSISOLatin3StringEncoding = "欧米（ISO Latin 3）";
NSISOLatin4StringEncoding = "中欧（ISO Latin 4）";
NSISOLatinCyrillicStringEncoding = "キリル文字（ISO 8859-5）";
NSISOLatinArabicStringEncoding = "アラビア語（ISO 8859-6）";
NSISOLatinGreekStringEncoding = "ギリシャ語（ISO 8859-7）";
NSISOLatinHebrewStringEncoding = "ヘブライ語（ISO 8859-8）";
NSISOCyrillicStringEncoding = "キリル文字（ISO 8859-5）";
NSISOArabicStringEncoding = "アラビア語（ISO 8859-6）";
NSISOGreekStringEncoding = "ギリシャ語（ISO 8859-7）";
NSISOHebrewStringEncoding = "ヘブライ語（ISO 8859-8）";
NSISOLatin5StringEncoding = "トルコ語（ISO Latin 5）";
NSISOLatin6StringEncoding = "北欧（ISO Latin 6）";
NSISOLatinThaiStringEncoding = "タイ語（ISO 8859-11）";
NSISOThaiStringEncoding = "タイ語（ISO 8859-11）";
NSISOLatin7StringEncoding = "バルト諸語（ISO Latin 7）";
NSISOLatin8StringEncoding = "ケルト語（ISO Latin 8）";
NSISOLatin9StringEncoding = "欧米（ISO Latin 9）";

10
Resources/Korean.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "서유럽어(Mac OS Roman)";
NSUTF7StringEncoding = "유니코드(UTF-7)";
NSISOLatin3StringEncoding = "서유럽어(ISO Latin 3)";
NSISOLatin4StringEncoding = "중앙 유럽어(ISO Latin 4)";
NSISOLatinCyrillicStringEncoding = "키릴 자모(ISO 8859-5)";
NSISOLatinArabicStringEncoding = "아랍어(ISO 8859-6)";
NSISOLatinGreekStringEncoding = "그리스어(ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "히브리어(ISO 8859-8)";
NSISOCyrillicStringEncoding = "키릴 자모(ISO 8859-5)";
NSISOArabicStringEncoding = "아랍어(ISO 8859-6)";
NSISOGreekStringEncoding = "그리스어(ISO 8859-7)";
NSISOHebrewStringEncoding = "히브리어(ISO 8859-8)";
NSISOLatin5StringEncoding = "터키어(ISO Latin 5)";
NSISOLatin6StringEncoding = "북유럽어(ISO Latin 6)";
NSISOLatinThaiStringEncoding = "태국어(ISO 8859-11)";
NSISOThaiStringEncoding = "태국어(ISO 8859-11)";
NSISOLatin7StringEncoding = "발트어(ISO Latin 7)";
NSISOLatin8StringEncoding = "켈트어(ISO Latin 8)";
NSISOLatin9StringEncoding = "서유럽어(ISO Latin 9)";

10
Resources/Polish.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "Zachodni (Mac OS Roman)";
NSUTF7StringEncoding = "Unicode (UTF-7)";
NSISOLatin3StringEncoding = "Zachodni (ISO Latin 3)";
NSISOLatin4StringEncoding = "Środkowoeuropejski (ISO Latin 4)";
NSISOLatinCyrillicStringEncoding = "Cyrylicki (ISO 8859-5)";
NSISOLatinArabicStringEncoding = "Arabski (ISO 8859-6)";
NSISOLatinGreekStringEncoding = "Grecki (ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "Hebrajski (ISO 8859-8)";
NSISOCyrillicStringEncoding = "Cyrylicki (ISO 8859-5)";
NSISOArabicStringEncoding = "Arabski (ISO 8859-6)";
NSISOGreekStringEncoding = "Grecki (ISO 8859-7)";
NSISOHebrewStringEncoding = "Hebrajski (ISO 8859-8)";
NSISOLatin5StringEncoding = "Turecki (ISO Latin 5)";
NSISOLatin6StringEncoding = "Nordycki (ISO Latin 6)";
NSISOLatinThaiStringEncoding = "Tajski (ISO 8859-11)";
NSISOThaiStringEncoding = "Tajski (ISO 8859-11)";
NSISOLatin7StringEncoding = "Bałtycki (ISO Latin 7)";
NSISOLatin8StringEncoding = "Celtycki (ISO Latin 8)";
NSISOLatin9StringEncoding = "Zachodni (ISO Latin 9)";

10
Resources/SimplifiedChinese.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "西文(Mac OS Roman)";
NSUTF7StringEncoding = "Unicode (UTF-7)";
NSISOLatin3StringEncoding = "西文(ISO Latin 3)";
NSISOLatin4StringEncoding = "中欧语系(ISO Latin 4)";
NSISOLatinCyrillicStringEncoding = "西里尔文(ISO 8859-5)";
NSISOLatinArabicStringEncoding = "阿拉伯文(ISO 8859-6)";
NSISOLatinGreekStringEncoding = "希腊文(ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "希伯来文(ISO 8859-8)";
NSISOCyrillicStringEncoding = "西里尔文(ISO 8859-5)";
NSISOArabicStringEncoding = "阿拉伯文(ISO 8859-6)";
NSISOGreekStringEncoding = "希腊文(ISO 8859-7)";
NSISOHebrewStringEncoding = "希伯来文(ISO 8859-8)";
NSISOLatin5StringEncoding = "土耳其文(ISO Latin 5)";
NSISOLatin6StringEncoding = "北日耳曼语支(ISO Latin 6)";
NSISOLatinThaiStringEncoding = "泰文(ISO 8859-11)";
NSISOThaiStringEncoding = "泰文(ISO 8859-11)";
NSISOLatin7StringEncoding = "波罗的海文(ISO Latin 7)";
NSISOLatin8StringEncoding = "凯尔特文(ISO Latin 8)";
NSISOLatin9StringEncoding = "西文(ISO Latin 9)";

10
Resources/Spanish.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "Occidental (Mac OS Roman)";
NSUTF7StringEncoding = "Unicode (UTF-7)";
NSISOLatin3StringEncoding = "Occidental (ISO latino 3)";
NSISOLatin4StringEncoding = "Centroeuropeo (ISO latino 4)";
NSISOLatinCyrillicStringEncoding = "Cirílico (ISO 8859-5)";
NSISOLatinArabicStringEncoding = "Árabe (ISO 8859-6)";
NSISOLatinGreekStringEncoding = "Griego (ISO 8859-7)";
NSISOLatinHebrewStringEncoding = "Hebreo (ISO 8859-8)";
NSISOCyrillicStringEncoding = "Cirílico (ISO 8859-5)";
NSISOArabicStringEncoding = "Árabe (ISO 8859-6)";
NSISOGreekStringEncoding = "Griego (ISO 8859-7)";
NSISOHebrewStringEncoding = "Hebreo (ISO 8859-8)";
NSISOLatin5StringEncoding = "Turco (ISO latino 5)";
NSISOLatin6StringEncoding = "Nórdico (ISO latino 6)";
NSISOLatinThaiStringEncoding = "Tailandés (ISO 8859-11)";
NSISOThaiStringEncoding = "Tailandés (ISO 8859-11)";
NSISOLatin7StringEncoding = "Báltico (ISO latino 7)";
NSISOLatin8StringEncoding = "Celta (ISO latino 8)";
NSISOLatin9StringEncoding = "Occidental (ISO latino 9)";

10
Resources/TraditionalChinese.lproj/Localizable.strings
View file

@ -69,13 +69,13 @@ NSMacHFSStringEncoding = "西方語系（Mac OS Roman）";
NSUTF7StringEncoding = "Unicode（UTF-7）";
NSISOLatin3StringEncoding = "西方語系（ISO Latin 3）";
NSISOLatin4StringEncoding = "中歐語系（ISO Latin 4）";
NSISOLatinCyrillicStringEncoding = "斯拉夫語系（ISO 8859-5）";
NSISOLatinArabicStringEncoding = "阿拉伯文（ISO 8859-6）";
NSISOLatinGreekStringEncoding = "希臘文（ISO 8859-7）";
NSISOLatinHebrewStringEncoding = "希伯來文（ISO 8859-8）";
NSISOCyrillicStringEncoding = "斯拉夫語系（ISO 8859-5）";
NSISOArabicStringEncoding = "阿拉伯文（ISO 8859-6）";
NSISOGreekStringEncoding = "希臘文（ISO 8859-7）";
NSISOHebrewStringEncoding = "希伯來文（ISO 8859-8）";
NSISOLatin5StringEncoding = "土耳其文（ISO Latin 5）";
NSISOLatin6StringEncoding = "北日耳曼語系（ISO Latin 6）";
NSISOLatinThaiStringEncoding = "泰文（ISO 8859-11）";
NSISOThaiStringEncoding = "泰文（ISO 8859-11）";
NSISOLatin7StringEncoding = "波羅的海語系（ISO Latin 7）";
NSISOLatin8StringEncoding = "克爾特文（ISO Latin 8）";
NSISOLatin9StringEncoding = "西方語系（ISO Latin 9）";

25
Source/Additions/Unicode.m
View file

@ -221,7 +221,8 @@ static struct _strenc_ str_encoding_table[] = {
"NSProprietaryStringEncoding","",0,0,0},
#endif
// GNUstep additions
/* GNUstep additions
*/
{NSISOCyrillicStringEncoding,
"NSISOCyrillicStringEncoding","ISO-8859-5",0,1,0},
{NSKOI8RStringEncoding,
@ -259,8 +260,8 @@ static struct _strenc_ str_encoding_table[] = {
{NSKoreanEUCStringEncoding,
"NSKoreanEUCStringEncoding","EUC-KR",0,0,0},
/* DOS and Windows encodings
*/
/* DOS and Windows encodings
*/
{NSDOSLatinUSStringEncoding,
"NSDOSLatinUSStringEncoding","CP437",0,0,0},
{NSDOSGreekStringEncoding,
@ -314,10 +315,10 @@ static struct _strenc_ str_encoding_table[] = {
{NSWindowsKoreanJohabStringEncoding,
"NSWindowsKoreanJohabStringEncoding","CP1361",0,0,0},
{NSGB_2312_80StringEncoding,
"NSGB_2312_80StringEncoding","EUC-CN",0,0,0}, // Same as NSChineseEUCStringEncoding
{NSGBK_95StringEncoding,
"NSGBK_95StringEncoding","CP936",0,0,0}, // Same as NSDOSChineseSimplifStringEncoding
{NSGB_2312_80StringEncoding, // Same as NSChineseEUCStringEncoding
"NSGB_2312_80StringEncoding","EUC-CN",0,0,0},
{NSGBK_95StringEncoding, // Same as NSDOSChineseSimplifStringEncoding
"NSGBK_95StringEncoding","CP936",0,0,0},
{NSGB_18030_2000StringEncoding,
"NSGB_18030_2000StringEncoding","GB18030",0,0,0},
@ -338,7 +339,7 @@ static struct _strenc_ str_encoding_table[] = {
};
static unsigned encTableSize = 0;
static NSMapTable *encodingPointerTable = nil;
static NSMapTable *encodingPointerTable = nil;
static void GSSetupEncodingTable(void)
{
@ -3033,9 +3034,9 @@ GSPrivateDefaultCStringEncoding()
else
{
fprintf(stderr,
"WARNING: %s - encoding not supported.\n", encoding);
"WARNING: %s - encoding not supported.\n", encoding);
fprintf(stderr,
" NSISOLatin1StringEncoding set as default.\n");
" NSISOLatin1StringEncoding set as default.\n");
defEnc = NSISOLatin1StringEncoding;
}
}
@ -3050,9 +3051,9 @@ GSPrivateDefaultCStringEncoding()
else if (GSPrivateIsEncodingSupported(defEnc) == NO)
{
fprintf(stderr, "WARNING: %s - encoding not implemented as "
"default c string encoding.\n", encoding);
"default c string encoding.\n", encoding);
fprintf(stderr,
" NSISOLatin1StringEncoding set as default.\n");
" NSISOLatin1StringEncoding set as default.\n");
defEnc = NSISOLatin1StringEncoding;
}