From: Angus Leeming Date: Mon, 29 Apr 2002 14:26:42 +0000 (+0000) Subject: Internationalise the language names in the character dialog's combox. X-Git-Tag: 1.6.10~19321 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=93ad5c74f12ae19273406b519433cd2dbf8ebb44;p=features.git Internationalise the language names in the character dialog's combox. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4086 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 3f8f2fb261..5b545e1893 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,12 @@ +2002-04-29 Angus Leeming + + * character.[Ch] (getLanguageData): returns a vector + where LanguagePair is a display string and an identifying string. + The display string is internationalised. + + * ControlCharacter.C (getLanguage, setLanguage): Do not internationalise + the identifying strings, "No change" and "Reset". + 2002-04-25 Herbert Voss * ControlSendto.C (allFormats): don't add the graphics extensions to the diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C index 2d108af96e..2f249c4fd2 100644 --- a/src/frontends/controllers/ControlCharacter.C +++ b/src/frontends/controllers/ControlCharacter.C @@ -220,16 +220,16 @@ string ControlCharacter::getLanguage() const { if (font_.get() && font_->language()) return font_->language()->lang(); - return _("No change"); + return "No change"; } void ControlCharacter::setLanguage(string const & val) { - if (val == _("No change")) + if (val == "No change") font_->setLanguage(ignore_language); - else if (val == _("Reset")) + else if (val == "Reset") font_->setLanguage(lv_.buffer()->params.language); else diff --git a/src/frontends/controllers/character.C b/src/frontends/controllers/character.C index 5b18932b43..812669099b 100644 --- a/src/frontends/controllers/character.C +++ b/src/frontends/controllers/character.C @@ -176,17 +176,19 @@ vector const getColorData() } -vector const getLanguageData() +vector const getLanguageData() { - vector langs(languages.size() + 2); + vector langs(languages.size() + 2); - langs[0] = _("No change"); - langs[1] = _("Reset"); + langs[0].first = N_("No change"); langs[0].second = "No change"; + langs[1].first = N_("Reset"); langs[1].second = "Reset"; - vector::size_type i = 1; + vector::size_type i = 2; for (Languages::const_iterator cit = languages.begin(); cit != languages.end(); ++cit) { - langs[++i] = cit->second.lang(); + langs[i].first = cit->second.display(); + langs[i].second = cit->second.lang(); + ++i; } return langs; diff --git a/src/frontends/controllers/character.h b/src/frontends/controllers/character.h index 483f4b8b90..32185ea29b 100644 --- a/src/frontends/controllers/character.h +++ b/src/frontends/controllers/character.h @@ -50,21 +50,23 @@ namespace character { typedef std::pair BarPair; /// typedef std::pair ColorPair; + /// + typedef std::pair LanguagePair; /// - std::vector const getFamilyData(); + std::vector const getFamilyData(); /// - std::vector const getSeriesData(); + std::vector const getSeriesData(); /// - std::vector const getShapeData(); + std::vector const getShapeData(); /// - std::vector const getSizeData(); + std::vector const getSizeData(); /// - std::vector const getBarData(); + std::vector const getBarData(); /// - std::vector const getColorData(); + std::vector const getColorData(); /// - std::vector const getLanguageData(); + std::vector const getLanguageData(); } // namespace character diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index aaa35a852e..ba716c2c71 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,10 @@ +2002-04-29 Angus Leeming + + * FormCharacter.h: store a vector lang_ of language identifiers. + + * FormCharacter.C: changes associated with character::getLanguageData + returning a vector rather than a vector. + 2002-04-26 John Levon * FormMathsPanel.C: translate Close diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C index e65448d493..d132b33355 100644 --- a/src/frontends/xforms/FormCharacter.C +++ b/src/frontends/xforms/FormCharacter.C @@ -47,21 +47,22 @@ void FormCharacter::build() { dialog_.reset(build_character()); - vector const family = getFamilyData(); - vector const series = getSeriesData(); - vector const shape = getShapeData(); - vector const size = getSizeData(); - vector const bar = getBarData(); - vector const color = getColorData(); - vector const language = getLanguageData(); - - // Store the enums for later + vector const family = getFamilyData(); + vector const series = getSeriesData(); + vector const shape = getShapeData(); + vector const size = getSizeData(); + vector const bar = getBarData(); + vector const color = getColorData(); + vector const language = getLanguageData(); + + // Store the identifiers for later family_ = getSecond(family); series_ = getSecond(series); - shape_ = getSecond(shape); - size_ = getSecond(size); - bar_ = getSecond(bar); - color_ = getSecond(color); + shape_ = getSecond(shape); + size_ = getSecond(size); + bar_ = getSecond(bar); + color_ = getSecond(color); + lang_ = getSecond(language); // create a string of entries " entry1 | entry2 | entry3 | entry4 " // with which to initialise the xforms choice object. @@ -98,11 +99,11 @@ void FormCharacter::build() fl_end_form(); // build up the combox entries - for (vector::const_iterator cit = language.begin(); + for (vector::const_iterator cit = language.begin(); cit != language.end(); ++cit) { - combo_language2_->addto(*cit); + combo_language2_->addto(_(cit->first)); } - combo_language2_->select(*language.begin()); + combo_language2_->select(1); // Manage the ok, apply and cancel/close buttons bc().setApply(dialog_->button_apply); @@ -133,7 +134,8 @@ void FormCharacter::apply() pos = fl_get_choice(dialog_->choice_color); controller().setColor(color_[pos-1]); - controller().setLanguage(combo_language2_->getline()); + pos = combo_language2_->get(); + controller().setLanguage(lang_[pos-1]); bool const toggleall = fl_get_button(dialog_->check_toggle_all); controller().setToggleAll(toggleall); @@ -175,7 +177,8 @@ void FormCharacter::update() pos = int(findPos(color_, controller().getColor())); fl_set_choice(dialog_->choice_color, pos+1); - combo_language2_->select(controller().getLanguage()); + pos = int(findPos(lang_, controller().getLanguage())); + combo_language2_->select(pos+1); fl_set_button(dialog_->check_toggle_all, controller().getToggleAll()); } @@ -209,8 +212,8 @@ ButtonPolicy::SMInput FormCharacter::input(FL_OBJECT *, long) if (color_[pos-1] != LColor::ignore) activate = ButtonPolicy::SMI_VALID; - string const language = combo_language2_->getline(); - if (language != _("No change")) + pos = combo_language2_->get(); + if (lang_[pos-1] != "No change") activate = ButtonPolicy::SMI_VALID; return activate; diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h index a2a2c1c880..9eb42c84b2 100644 --- a/src/frontends/xforms/FormCharacter.h +++ b/src/frontends/xforms/FormCharacter.h @@ -71,6 +71,8 @@ private: std::vector bar_; /// std::vector color_; + /// + std::vector lang_; }; #endif