Add language information in model names when they were missing.

Models are language specific (there could be several models for the same
charset but different languages). Let's have a clear naming scheme.
This commit is contained in:
Jehan 2015-11-27 18:21:13 +01:00
parent c61e65aeb3
commit 984d8f7b09
4 changed files with 22 additions and 22 deletions

View File

@ -300,7 +300,7 @@ static const PRUint8 RussianLangModel[] =
};
const SequenceModel Koi8rModel =
const SequenceModel Koi8rCyrillicModel =
{
KOI8R_CharToOrderMap,
RussianLangModel,
@ -309,7 +309,7 @@ const SequenceModel Koi8rModel =
"KOI8-R"
};
const SequenceModel Win1251Model =
const SequenceModel Win1251CyrillicModel =
{
win1251_CharToOrderMap,
RussianLangModel,
@ -318,7 +318,7 @@ const SequenceModel Win1251Model =
"WINDOWS-1251"
};
const SequenceModel Latin5Model =
const SequenceModel Latin5CyrillicModel =
{
latin5_CharToOrderMap,
RussianLangModel,
@ -327,7 +327,7 @@ const SequenceModel Latin5Model =
"ISO-8859-5"
};
const SequenceModel MacCyrillicModel =
const SequenceModel MacCyrillicModel =
{
macCyrillic_CharToOrderMap,
RussianLangModel,
@ -336,7 +336,7 @@ const SequenceModel MacCyrillicModel =
"MAC-CYRILLIC"
};
const SequenceModel Ibm866Model =
const SequenceModel Ibm866CyrillicModel =
{
IBM866_CharToOrderMap,
RussianLangModel,
@ -345,7 +345,7 @@ const SequenceModel Ibm866Model =
"IBM866"
};
const SequenceModel Ibm855Model =
const SequenceModel Ibm855CyrillicModel =
{
IBM855_CharToOrderMap,
RussianLangModel,

View File

@ -225,7 +225,7 @@ static const PRUint8 GreekLangModel[] =
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
};
const SequenceModel Latin7Model =
const SequenceModel Latin7GreekModel =
{
Latin7_CharToOrderMap,
GreekLangModel,
@ -234,7 +234,7 @@ const SequenceModel Latin7Model =
"ISO-8859-7"
};
const SequenceModel Win1253Model =
const SequenceModel Win1253GreekModel =
{
win1253_CharToOrderMap,
GreekLangModel,

View File

@ -46,14 +46,14 @@
nsSBCSGroupProber::nsSBCSGroupProber()
{
mProbers[0] = new nsSingleByteCharSetProber(&Win1251Model);
mProbers[1] = new nsSingleByteCharSetProber(&Koi8rModel);
mProbers[2] = new nsSingleByteCharSetProber(&Latin5Model);
mProbers[0] = new nsSingleByteCharSetProber(&Win1251CyrillicModel);
mProbers[1] = new nsSingleByteCharSetProber(&Koi8rCyrillicModel);
mProbers[2] = new nsSingleByteCharSetProber(&Latin5CyrillicModel);
mProbers[3] = new nsSingleByteCharSetProber(&MacCyrillicModel);
mProbers[4] = new nsSingleByteCharSetProber(&Ibm866Model);
mProbers[5] = new nsSingleByteCharSetProber(&Ibm855Model);
mProbers[6] = new nsSingleByteCharSetProber(&Latin7Model);
mProbers[7] = new nsSingleByteCharSetProber(&Win1253Model);
mProbers[4] = new nsSingleByteCharSetProber(&Ibm866CyrillicModel);
mProbers[5] = new nsSingleByteCharSetProber(&Ibm855CyrillicModel);
mProbers[6] = new nsSingleByteCharSetProber(&Latin7GreekModel);
mProbers[7] = new nsSingleByteCharSetProber(&Win1253GreekModel);
mProbers[8] = new nsSingleByteCharSetProber(&Latin5BulgarianModel);
mProbers[9] = new nsSingleByteCharSetProber(&Win1251BulgarianModel);
mProbers[10] = new nsSingleByteCharSetProber(&TIS620ThaiModel);

View File

@ -119,14 +119,14 @@ protected:
};
extern const SequenceModel Koi8rModel;
extern const SequenceModel Win1251Model;
extern const SequenceModel Latin5Model;
extern const SequenceModel Koi8rCyrillicModel;
extern const SequenceModel Win1251CyrillicModel;
extern const SequenceModel Latin5CyrillicModel;
extern const SequenceModel MacCyrillicModel;
extern const SequenceModel Ibm866Model;
extern const SequenceModel Ibm855Model;
extern const SequenceModel Latin7Model;
extern const SequenceModel Win1253Model;
extern const SequenceModel Ibm866CyrillicModel;
extern const SequenceModel Ibm855CyrillicModel;
extern const SequenceModel Latin7GreekModel;
extern const SequenceModel Win1253GreekModel;
extern const SequenceModel Latin5BulgarianModel;
extern const SequenceModel Win1251BulgarianModel;
extern const SequenceModel Latin2HungarianModel;