Author: locilka
Date: Thu Oct 25 11:52:49 2007
New Revision: 41562
URL: http://svn.opensuse.org/viewcvs/yast?rev=41562&view=rev
Log:
- Evaluate also textdomain of a merged control file when searching
for translated text (#271608).
Modified:
branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp
branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes
Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp?rev=41562&r1=41561&r2=41562&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp Thu Oct 25 11:52:49 2007
@@ -743,14 +743,16 @@
}
global string GetTranslatedText (string key) {
- map text = texts[key]:$[];
+ map controlfile_texts = ProductFeatures::GetSection ("texts");
+ map text = (map ) controlfile_texts[key]:$[];
+
string label = text["label"]:"";
if (label == "")
{
y2error ("The requested label %1 does not exist", key);
return "";
}
- string domain = text["textdomain"]:"";
+ string domain = text["textdomain"]:productControl["textdomain"]:"control";
if (domain == "")
{
y2error ("The text domain for label %1 not set", key);
Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes?rev=41562&r1=41561&r2=41562&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes Thu Oct 25 11:52:49 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Oct 25 11:50:28 CEST 2007 - locilka@suse.cz
+
+- Evaluate also textdomain of a merged control file when searching
+ for translated text (#271608).
+
+-------------------------------------------------------------------
Wed Apr 11 10:14:42 CEST 2007 - lslezak@suse.cz
- properly detect PV/FV Xen machine (#255217)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
