diff options
| author | Eike Rathke <erack@redhat.com> | 2011-12-09 22:33:50 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-12-09 22:36:15 +0100 |
| commit | 8c736b8543ca3d36612270cb4ceb2ae0a7abe2e7 (patch) | |
| tree | 43dce984ebf949698daf6c272c506ab597c6b8bd /svtools | |
| parent | 4345b5cb72980dc351147da77505ed06a93028ab (diff) | |
fixed fdo#37349 present Catalan (Valencian) as selectable UI language
Catalan (Valencian) has no ISO 639 code assigned and the UI localization uses
the ca-XV hack where XV is of the reserved ISO 3166 user-assigned range. This
should not escape to document content therefor internally a replacement to
ca-ES is done for all locale attribution. For the UI localization to be
distinguishable under Tools->Options->LanguageSettings->UserInterface this
needed a special handling to allow Catalan (Valencian) again.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/langtab.hxx | 8 | ||||
| -rw-r--r-- | svtools/source/misc/langtab.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/misc/langtab.src | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx index 9b38297433bf..578532271277 100644 --- a/svtools/inc/svtools/langtab.hxx +++ b/svtools/inc/svtools/langtab.hxx @@ -43,7 +43,13 @@ public: SvtLanguageTable(); ~SvtLanguageTable(); - const String& GetString( const LanguageType eType ) const; + /** + @param bUserInterfaceSelection + If TRUE, don't replace an UI-only locale. Only use for + Tools->Options->LanguageSettings->UserInterface listbox. + If FALSE, do replace. + */ + const String& GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const; LanguageType GetType( const String& rStr ) const; sal_uInt32 GetEntryCount() const; diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 2ce718e54d2b..51e93d485065 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -136,9 +136,9 @@ SvtLanguageTable::~SvtLanguageTable() //------------------------------------------------------------------------ -const String& SvtLanguageTable::GetString( const LanguageType eType ) const +const String& SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const { - LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType); + LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType, bUserInterfaceSelection); sal_uInt32 nPos = FindIndex( eLang ); if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 5d743e30f16c..b82e0f467763 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -79,6 +79,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Bulgarian" ; LANGUAGE_BULGARIAN ; > ; < "Belarusian" ; LANGUAGE_BELARUSIAN ; > ; < "Catalan" ; LANGUAGE_CATALAN ; > ; + < "Catalan (Valencian)" ; LANGUAGE_USER_CATALAN_VALENCIAN ; > ; // UI only! < "Chinese (traditional)" ; LANGUAGE_CHINESE_TRADITIONAL ; > ; < "Chinese (simplified)" ; LANGUAGE_CHINESE_SIMPLIFIED ; > ; < "Chinese (Hong Kong)" ; LANGUAGE_CHINESE_HONGKONG ; > ; |