Author: locilka Date: Thu Feb 7 15:46:18 2008 New Revision: 44241 URL: http://svn.opensuse.org/viewcvs/yast?rev=44241&view=rev Log: - Functionality that integrates the just-selected language translation has been moved to integrate_translation_extension client to make it available for other modules. - New label for "Show in Fullscreen" button to better match what it really does (bnc #359527). Added: trunk/installation/src/clients/integrate_translation_extension.ycp Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/modules/InstData.ycp trunk/installation/src/modules/InstExtensionImage.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=44241&r1=44240&r2=44241&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Feb 7 15:46:18 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Feb 7 14:19:11 CET 2008 - locilka@suse.cz + +- Functionality that integrates the just-selected language + translation has been moved to integrate_translation_extension + client to make it available for other modules. +- New label for "Show in Fullscreen" button to better match what + it really does (bnc #359527). + +------------------------------------------------------------------- Wed Feb 6 13:23:35 CET 2008 - locilka@suse.cz - Better /lbin/wget handling in InstExtensionImage. Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_complex_welcome.ycp?rev=44241&r1=44240&r2=44241&view=diff ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Thu Feb 7 15:46:18 2008 @@ -41,7 +41,6 @@ import "Icon"; import "InstData"; import "ProductLicense"; - import "InstExtensionImage"; string language = Language::language; @@ -71,76 +70,6 @@ } } - list <string> available_lang_filenames = []; - - string GetLanguageExtensionFilename (string language) { - list <string> check_for_languages = [language]; - - // 'en_US' ? add also 'en' - if (size (language) > 2) { - check_for_languages = add (check_for_languages, substring (language, 0, 2)); - } - - // Default fallback - string filename = "root.en_US"; - - foreach (string one_language, check_for_languages, { - if (contains (available_lang_filenames, one_language)) { - filename = sformat ("root.%1", one_language); - y2milestone ("Using %1 for %2", filename, language); - break; - } - }); - - return filename; - } - - /** - * Finds out the list of supported languages - */ - list <string> GetListOfSupportedLangExtensions () { - list <string> ret = []; - - // SUPPLANGS in content file - string supplangs = (string) SCR::Read (.content.SUPPLANGS); - - if (supplangs != nil) { - ret = splitstring (supplangs, " "); - - ret = filter (string one_supplang, ret, { - return (one_supplang != nil && one_supplang != ""); - }); - - return ret; - } - - // Fallback: using list of trans-stats - y2milestone ("No SUPPLANGS defined, using a fallback"); - map cmd = (map) WFM::Execute (.local.bash_output, "ls -1 /usr/lib/YaST2/trans/ | sed 's/\.status//'"); - - if (cmd["exit"]:-1 != 0) { - y2error ("Cannot find out list of languages: %1", cmd); - return []; - } - - // Empty list of trans stats - string langs_s = cmd["stdout"]:""; - if (langs_s == nil || langs_s == "") { - y2milestone ("Empty list: %1", langs_s); - - return []; - } - - // Newline-separated langs - ret = splitstring (langs_s, "\n"); - - ret = filter (string one_supplang, ret, { - return (one_supplang != nil && one_supplang != ""); - }); - - return ret; - } - // ------------------------------------- main part of the client ----------- map argmap = GetInstArgs::argmap(); @@ -278,14 +207,14 @@ )), `VStretch (), // TRANSLATORS: button label - `Right (`PushButton (`id (`show_fulscreen_license), _("&Show In Full-Screen..."))) + `Right (`PushButton (`id (`show_fulscreen_license), _("&Show License..."))) )) ) ), `VWeight (3, `VStretch()) ); - term FullScreenLicenseDialog () { + term AllLicensesDialog () { return `MinHeight ((text_mode ? 20 : 25), `VBox ( `Left (`HBox ( Icon::Simple ("yast-license"), @@ -409,11 +338,7 @@ // and the new language is not the initial one (that one is already downloaded by Linuxrc) if (Stage::initial() && ret == `language) { if (InstData::initial_installation_language != language) { - // TRANSLATORS: busy message - UI::OpenDialog (`Label (_("Downloading installation system language extension..."))); - // FATE #302955: Split translations out of installation system - InstExtensionImage::DownloadAndIntegrateExtension (GetLanguageExtensionFilename (language)); - UI::CloseDialog(); + WFM::call ("integrate_translation_extension", [$["requested_language":language]]); } else { y2milestone ("Skipping downloading %1 extension again (initial language)", InstData::initial_installation_language); } @@ -496,14 +421,6 @@ return `auto; } - // FATE #302955: Split translations out of installation system - // [ "en_US", "en_GB", "de", "cs" ] - // they are in content.SUPPLANGS or as files in /usr/lib/YaST2/trans - if (available_lang_filenames == nil || available_lang_filenames == []) { - available_lang_filenames = GetListOfSupportedLangExtensions(); - y2milestone ("Supported languages are: %1", available_lang_filenames); - } - // Store the initial language if (InstData::initial_installation_language == nil) { InstData::initial_installation_language = Language::language; @@ -548,7 +465,7 @@ if (ret == `next) break; } else if (ret == `show_fulscreen_license) { - UI::OpenDialog (FullScreenLicenseDialog()); + UI::OpenDialog (AllLicensesDialog()); ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp); UI::CloseDialog(); } Added: trunk/installation/src/clients/integrate_translation_extension.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/integrate_translation_extension.ycp?rev=44241&view=auto ============================================================================== --- trunk/installation/src/clients/integrate_translation_extension.ycp (added) +++ trunk/installation/src/clients/integrate_translation_extension.ycp Thu Feb 7 15:46:18 2008 @@ -0,0 +1,118 @@ +/** + * File: + * integrate_translation_extension.ycp + * + * Module: + * Installation + * + * Authors: + * Lukas Ocilka + * + * Summary: + * This client downloads and integrates a translation + * extension for the current language. + * This module needs to be called this way: + * WFM::call ("integrate_translation_extension", [$["requested_language":"de_DE"]]) + * + * $Id:$ + * + */ +{ + textdomain "installation"; + + import "InstExtensionImage"; + import "InstData"; + import "GetInstArgs"; + + /** + * Finds out the list of supported languages + */ + list <string> GetListOfSupportedLangExtensions () { + list <string> ret = []; + + // SUPPLANGS in content file + string supplangs = (string) SCR::Read (.content.SUPPLANGS); + + if (supplangs != nil) { + ret = splitstring (supplangs, " "); + + ret = filter (string one_supplang, ret, { + return (one_supplang != nil && one_supplang != ""); + }); + + return ret; + } + + // Fallback: using list of trans-stats + y2milestone ("No SUPPLANGS defined, using a fallback"); + map cmd = (map) WFM::Execute (.local.bash_output, "ls -1 /usr/lib/YaST2/trans/ | sed 's/\.status//'"); + + if (cmd["exit"]:-1 != 0) { + y2error ("Cannot find out list of languages: %1", cmd); + return []; + } + + // Empty list of trans stats + string langs_s = cmd["stdout"]:""; + if (langs_s == nil || langs_s == "") { + y2milestone ("Empty list: %1", langs_s); + + return []; + } + + // Newline-separated langs + ret = splitstring (langs_s, "\n"); + + ret = filter (string one_supplang, ret, { + return (one_supplang != nil && one_supplang != ""); + }); + + return ret; + } + + string GetLanguageExtensionFilename (string language) { + // FATE #302955: Split translations out of installation system + // this is lazy init + if (InstData::available_lang_filenames == nil || InstData::available_lang_filenames == []) { + InstData::available_lang_filenames = GetListOfSupportedLangExtensions(); + y2milestone ("Supported languages are: %1", InstData::available_lang_filenames); + } + + list <string> check_for_languages = [language]; + + // 'en_US' ? add also 'en' + if (size (language) > 2) { + check_for_languages = add (check_for_languages, substring (language, 0, 2)); + } + + // Default fallback + string filename = "root.en_US"; + + foreach (string one_language, check_for_languages, { + if (contains (InstData::available_lang_filenames, one_language)) { + filename = sformat ("root.%1", one_language); + break; + } + }); + + y2milestone ("Using %1 for %2", filename, language); + + return filename; + } + + y2milestone ("Starting: integrate_translation"); + + map argmap = GetInstArgs::argmap(); + y2milestone ("Args: %1", argmap); + string language = argmap["requested_language"]:"en_US"; + + // TRANSLATORS: busy message + UI::OpenDialog (`Label (_("Downloading installation system language extension..."))); + // FATE #302955: Split translations out of installation system + InstExtensionImage::DownloadAndIntegrateExtension (GetLanguageExtensionFilename (language)); + UI::CloseDialog(); + + y2milestone ("Finished: integrate_translation"); + + return `next; +} Modified: trunk/installation/src/modules/InstData.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstData.ycp?rev=44241&r1=44240&r2=44241&view=diff ============================================================================== --- trunk/installation/src/modules/InstData.ycp (original) +++ trunk/installation/src/modules/InstData.ycp Thu Feb 7 15:46:18 2008 @@ -41,6 +41,11 @@ // and language extension already merged global string initial_installation_language = nil; + // FATE #302955: Split translations out of installation system + // [ "en_US", "en_GB", "de", "cs" ] + // they are in content.SUPPLANGS or as files in /usr/lib/YaST2/trans + global list <string> available_lang_filenames = []; + // <-- other /* EOF */ Modified: trunk/installation/src/modules/InstExtensionImage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstExtensionImage.ycp?rev=44241&r1=44240&r2=44241&view=diff ============================================================================== --- trunk/installation/src/modules/InstExtensionImage.ycp (original) +++ trunk/installation/src/modules/InstExtensionImage.ycp Thu Feb 7 15:46:18 2008 @@ -9,7 +9,7 @@ * * This module provides functions that download inst-sys extension images * (localization, fonts, ...) and merge them to the current int-sys. - * This enables inst-sys to be modular even for running YaST. + * This enables inst-sys to be modular even for already running YaST. * See FATE #302955: 'Split translations out of installation system'. * This module is strictly installation-only! */ @@ -24,6 +24,7 @@ import "String"; import "Directory"; import "FileUtils"; + import "Stage"; /*** * @@ -286,12 +287,34 @@ /** * Downloads extension archive (file system image) and integrates - * it to the current system. + * it to the current system. Extension name (param) is relative to the + * 'InstsysURL' defined in '/etc/install.inf', but no "../" are processed/merged. + * See the example. + * + * Attention: This modue is 'silent', it doesn't open up any progress dialog + * when downloading the image. Keep in mind that downloading might take some time + * and that user should be informed by a busy pop-up. + * + * @example + * // Let's assume that: + * // InstsysURL: http://example.org/SUSE/boot/ppc/root + * // + * UI::OpenDialog (`Label (_("Downloading ABC extension..."))); + * DownloadAndIntegrateExtension ("some_dir/filename.squashfs"); + * UI::CloseDialog(); + * // + * // Downloads and integrates + * // http://example.org/SUSE/boot/ppc/some_dir/filename.squashfs + * * * @param string extension name * @return boolean if successful */ global boolean DownloadAndIntegrateExtension (string extension) { + if (!Stage::initial()) { + y2error ("This module should be used in Stage::initial only!"); + } + if (extension == nil || extension == "") { y2error ("Such extension name can't work: %1", extension); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org