Author: locilka Date: Fri Feb 15 13:19:49 2008 New Revision: 44505 URL: http://svn.opensuse.org/viewcvs/yast?rev=44505&view=rev Log: Language::language can use format: xx_YY or xxx_YY or ...? So... - substring (Language::language, 0, 2), + splitstring (Language::language, "_")[0]:"", Modified: trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/clients/inst_release_notes.ycp trunk/installation/src/clients/integrate_translation_extension.ycp trunk/installation/src/clients/release_notes_popup.ycp 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=44505&r1=44504&r2=44505&view=diff ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Fri Feb 15 13:19:49 2008 @@ -59,7 +59,7 @@ y2milestone ("content LINGUAS %1", linguas); list <string> all_linguas = splitstring (linguas, " "); - string language_short = substring (selected_language, 0, 2); + string language_short = splitstring (selected_language, "_")[0]:""; if (!contains (all_linguas, selected_language) && !contains (all_linguas, language_short)) { y2milestone ("Language %1 is not fully supported", selected_language); Modified: trunk/installation/src/clients/inst_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_release_notes.ycp?rev=44505&r1=44504&r2=44505&view=diff ============================================================================== --- trunk/installation/src/clients/inst_release_notes.ycp (original) +++ trunk/installation/src/clients/inst_release_notes.ycp Fri Feb 15 13:19:49 2008 @@ -87,7 +87,7 @@ list <string> preferred_langs = [ Language::language, - substring (Language::language, 0, 2), + splitstring (Language::language, "_")[0]:"", "en_US", "en_GB", "en" Modified: trunk/installation/src/clients/integrate_translation_extension.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/integrate_translation_extension.ycp?rev=44505&r1=44504&r2=44505&view=diff ============================================================================== --- trunk/installation/src/clients/integrate_translation_extension.ycp (original) +++ trunk/installation/src/clients/integrate_translation_extension.ycp Fri Feb 15 13:19:49 2008 @@ -82,7 +82,7 @@ // 'en_US' ? add also 'en' if (size (language) > 2) { - check_for_languages = add (check_for_languages, substring (language, 0, 2)); + check_for_languages = add (check_for_languages, splitstring (language, "_")[0]:""); } // Default fallback Modified: trunk/installation/src/clients/release_notes_popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/release_notes_popup.ycp?rev=44505&r1=44504&r2=44505&view=diff ============================================================================== --- trunk/installation/src/clients/release_notes_popup.ycp (original) +++ trunk/installation/src/clients/release_notes_popup.ycp Fri Feb 15 13:19:49 2008 @@ -49,7 +49,7 @@ tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); if (tmp == nil) { - tmp = sformat (path_templ, substring (Language::language, 0, 2)); + tmp = sformat (path_templ, splitstring (Language::language, "_")[0]:""); y2debug ("Trying to get %1", tmp); tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); } @@ -80,7 +80,7 @@ y2debug ("Trying to get %1", tmp); if (0 >= (integer)SCR::Read (.target.size, tmp)) { - tmp = sformat (path_templ, substring (Language::language, 0, 2)); + tmp = sformat (path_templ, splitstring (Language::language, "_")[0]:""); y2debug ("Trying to get %1", tmp); } if (0 >= (integer)SCR::Read (.target.size, tmp)) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org