Author: ug Date: Fri Feb 6 12:33:57 2009 New Revision: 55299 URL: http://svn.opensuse.org/viewcvs/yast?rev=55299&view=rev Log: fixed the translation of module/groups in the UI (bnc#448238). Thanx to Bubli for the gettext help :) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/conftree.ycp trunk/autoinstallation/src/modules/Y2ModuleConfig.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=55299&r1=55298&r2=55299&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Feb 6 12:33:57 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 6 12:30:58 CET 2009 - ug@suse.de + +- fixed the translation of module/groups in the UI (bnc#448238) + +------------------------------------------------------------------- Wed Feb 4 15:58:32 CET 2009 - ug@suse.de - SLP support added (fate#305827) Modified: trunk/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/conftree.ycp?rev=55299&r1=55298&r2=55299&view=diff ============================================================================== --- trunk/autoinstallation/src/include/conftree.ycp (original) +++ trunk/autoinstallation/src/include/conftree.ycp Fri Feb 6 12:33:57 2009 @@ -58,7 +58,11 @@ term groups( string selectedGroup ){ list<term> itemList = []; foreach(string k, map v, Y2ModuleConfig::GroupMap, { - term item = `item( `id(k),`icon(v["Icon"]:""), v["Name"]:"", k == selectedGroup ); + string desktop_file = substring( v["X-SuSE-DocTeamID"]:"", 4 ); + string translation = dpgettext("desktop_translations", "/usr/share/locale/", "Name("+desktop_file+".desktop): "+v["Name"]:"" ); + if( translation == "Name("+desktop_file+".desktop): "+v["Name"]:"" ) + translation = v["Name"]:""; + term item = `item( `id(k),`icon(v["Icon"]:""), translation, k == selectedGroup ); itemList = add(itemList, item ); }); return `SelectionBox( `id(`groups), `opt(`notify), _("Groups"), itemList ); @@ -77,15 +81,18 @@ foreach(string k , map v, Y2ModuleConfig::ModuleMap, ``{ if (v["X-SuSE-YaST-Group"]:"" == group_name) { - term item = `item( `id(k),`icon(v["Icon"]:""), v["Name"]:"", k == selectedModule ); + string desktop_file = substring( v["X-SuSE-DocTeamID"]:"", 4 ); + string translation = dpgettext("desktop_translations", "/usr/share/locale/", "Name("+desktop_file+".desktop): "+v["Name"]:"" ); + if( translation == "Name("+desktop_file+".desktop): "+v["Name"]:"" ) + translation = v["Name"]:""; + term item = `item( `id(k),`icon(v["Icon"]:""), translation, k == selectedModule ); itemList = add(itemList, item ); } }); if( 0 == size(itemList) ){ - itemList = add( itemList, `item(`id("none"), "No modules available" ) ); + itemList = add( itemList, `item(`id("none"), _("No modules available") ) ); } - map resourceMap = Y2ModuleConfig::GroupMap[group_name]:$[]; - return `SelectionBox(`id(`modules), `opt(`notify), resourceMap["Name"]:"" + " - " + _("Modules"), itemList ); + return `SelectionBox(`id(`modules), `opt(`notify), _("Modules"), itemList ); } /* Creates an `HBox containing the buttons to be displayed below the summary column @@ -123,7 +130,7 @@ string summary = (string) WFM::CallFunction( module_auto,["Summary"]); if( nil == summary ) summary = ""; - return `VBox( `Left(`Label( resourceMap["Name"]:"" + " - " + _("Details") )), + return `VBox( `Left(`Label( _("Details") )), `RichText( summary ), buttons() ); Modified: trunk/autoinstallation/src/modules/Y2ModuleConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Y2ModuleConfig.ycp?rev=55299&r1=55298&r2=55299&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/Y2ModuleConfig.ycp (original) +++ trunk/autoinstallation/src/modules/Y2ModuleConfig.ycp Fri Feb 6 12:33:57 2009 @@ -51,7 +51,8 @@ "X-SuSE-YaST-AutoInstMergeTypes", "X-SuSE-YaST-AutoInstDataType", "X-SuSE-YaST-AutoInstClonable", - "X-SuSE-YaST-AutoInstRequires" + "X-SuSE-YaST-AutoInstRequires", + "X-SuSE-DocTeamID" ]; Desktop::Read(Values); map configurations = Desktop::Modules; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org