tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix the Unicode localization file display incident. 

[UPDATE] Update 3 localization files.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@588 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2009-12-08 23:43:24 +00:00
parent cc875b2458
commit c16f0d3930
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/installer/nativeLang/chinese.xml
View File

@ -201,6 +201,7 @@
<Item id="10004" name="開啟此檔案到新啟動的 Notepad++"/> <Item id="10004" name="開啟此檔案到新啟動的 Notepad++"/>
<Item id="46001" name="設定程式語言格式..."/> <Item id="46001" name="設定程式語言格式..."/>
<Item id="46080" name="使用者自訂"/>
<Item id="47000" name="關於 Notepad++..."/> <Item id="47000" name="關於 Notepad++..."/>
<Item id="47001" name="Notepad++ 官方網站"/> <Item id="47001" name="Notepad++ 官方網站"/>
<Item id="47002" name="Notepad++ 在 SourceForge"/> <Item id="47002" name="Notepad++ 在 SourceForge"/>

1
PowerEditor/installer/nativeLang/english.xml
View File

@ -198,6 +198,7 @@
<Item id="46001" name="Style Configurator..."/> <Item id="46001" name="Style Configurator..."/>
<Item id="46080" name="User-Defined"/>
<Item id="47000" name="About Notepad++..."/> <Item id="47000" name="About Notepad++..."/>
<Item id="47001" name="Notepad++ Home"/> <Item id="47001" name="Notepad++ Home"/>
<Item id="47002" name="Notepad++ Project Page"/> <Item id="47002" name="Notepad++ Project Page"/>

1
PowerEditor/installer/nativeLang/french.xml
View File

@ -196,6 +196,7 @@
<Item id="10004" name="Ouvrir dans une nouvelle fenêtre"/> <Item id="10004" name="Ouvrir dans une nouvelle fenêtre"/>
<Item id="46001" name="Configurateur de coloration syntaxique..."/> <Item id="46001" name="Configurateur de coloration syntaxique..."/>
<Item id="46080" name="Langage utilisateur"/>
<Item id="47000" name="A propos de Notepad++"/> <Item id="47000" name="A propos de Notepad++"/>
<Item id="47001" name="Notepad++ Home"/> <Item id="47001" name="Notepad++ Home"/>
<Item id="47002" name="Notepad++ chez SourceForge"/> <Item id="47002" name="Notepad++ chez SourceForge"/>

3
PowerEditor/src/EncodingMapper.cpp
View File

@ -128,6 +128,9 @@ int EncodingMapper::getIndexFromEncoding(int encoding) const
int EncodingMapper::getEncodingFromString(const char *encodingAlias) const int EncodingMapper::getEncodingFromString(const char *encodingAlias) const
{ {
if (isInListA(encodingAlias, "utf-8 utf8"))
return 65001;
size_t nbItem = sizeof(encodings)/sizeof(EncodingUnit); size_t nbItem = sizeof(encodings)/sizeof(EncodingUnit);
int enc = -1; int enc = -1;
for (size_t i = 0 ; i < nbItem ; i++) for (size_t i = 0 ; i < nbItem ; i++)

4
PowerEditor/src/Notepad_plus.cpp
View File

@ -106,7 +106,9 @@ Notepad_plus::Notepad_plus(): Window(), _mainWindowStatus(0), _pDocTab(NULL), _p
{ {
const char * encodingStr = declaration->Encoding(); const char * encodingStr = declaration->Encoding();
EncodingMapper *em = EncodingMapper::getInstance(); EncodingMapper *em = EncodingMapper::getInstance();
_nativeLangEncoding = em->getEncodingFromString(encodingStr); int enc = em->getEncodingFromString(encodingStr);
if (enc != -1)
_nativeLangEncoding = enc;
} }
} }
} }