Author: locilka Date: Fri Nov 28 12:20:16 2008 New Revision: 53694 URL: http://svn.opensuse.org/viewcvs/yast?rev=53694&view=rev Log: - DefaultDesktop module now returns desktop name translated using the current language (bnc #449818). - 2.17.49 Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/DefaultDesktop.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=53694&r1=53693&r2=53694&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Nov 28 12:20:16 2008 @@ -1,10 +1,16 @@ ------------------------------------------------------------------- +Fri Nov 28 12:17:59 CET 2008 - locilka@suse.cz + +- DefaultDesktop module now returns desktop name translated using + the current language (bnc #449818). +- 2.17.49 + +------------------------------------------------------------------- Thu Nov 27 18:19:26 CET 2008 - locilka@suse.cz - Downloading slides only once (bnc #444612). - Do not reset/open the slide show in inst_rpmcopy when slide show dialog is already available/in use (bnc #443755). -- 2.17.49 ------------------------------------------------------------------- Wed Nov 26 13:54:46 CET 2008 - locilka@suse.cz Modified: trunk/packager/src/modules/DefaultDesktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesktop.ycp?rev=53694&r1=53693&r2=53694&view=diff ============================================================================== --- trunk/packager/src/modules/DefaultDesktop.ycp (original) +++ trunk/packager/src/modules/DefaultDesktop.ycp Fri Nov 28 12:20:16 2008 @@ -87,6 +87,8 @@ return; } + string desktop_label = (string) one_desktop_cf["label_id"]:MissingKey (one_desktop_cf, "label_id"); + // required keys one_desktop = $[ "desktop" : one_desktop_cf["desktop"]:MissingKey (one_desktop_cf, "desktop"), @@ -95,7 +97,9 @@ "packages" : splitstring (one_desktop_cf["packages"]:"", " \t\n"), "patterns" : splitstring (one_desktop_cf["patterns"]:"", " \t\n"), "order" : one_desktop_cf["order"]:MissingKey (one_desktop_cf, "order"), - "label" : ProductControl::GetTranslatedText ((string) one_desktop_cf["label_id"]:MissingKey (one_desktop_cf, "label_id")), + // BNC #449818, after switching the language name should change too + "label_id" : desktop_label, + "label" : ProductControl::GetTranslatedText (desktop_label), ]; // 'icon' in optional @@ -105,7 +109,11 @@ // 'description' is optional if (haskey (one_desktop_cf, "description_id")) { - one_desktop["description"] = ProductControl::GetTranslatedText ((string) one_desktop_cf["description_id"]:""); + string description_id = (string) one_desktop_cf["description_id"]:""; + + one_desktop["description"] = ProductControl::GetTranslatedText (description_id); + // BNC #449818, after switching the language description should change too + one_desktop["description_id"] = description_id; } // bnc #431251 @@ -144,8 +152,10 @@ * "desktop ID" : $[ * "desktop" : "desktop to start", // DEFAULT_WM * "order" : integer, - * "label" : _("Desktop Name Visible in Dialog"), - * "description" : _("Description text of the desktop"), + * "label" : _("Desktop Name Visible in Dialog (localized - initial localization)"), + * "label_id" : _("Desktop Name Visible in Dialog (original)"), + * "description" : _("Description text of the desktop (localized - initial localization)"), + * "description_id" : _("Description text of the desktop (originale)"), * "patterns" : ["list", "of", "related", "patterns"], * "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix) * ], @@ -298,7 +308,7 @@ global string Description () { Init(); - return all_desktops[desktop, "label"]:""; + return ProductControl::GetTranslatedText (all_desktops[desktop, "label_id"]:""); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org