Author: jsuchome
Date: Tue Sep 9 11:09:56 2008
New Revision: 50855
URL: http://svn.opensuse.org/viewcvs/yast?rev=50855&view=rev
Log:
merged proofread texts
- removed some obsoleted content file keys
- 2.17.4
Modified:
trunk/add-on-creator/VERSION
trunk/add-on-creator/package/yast2-add-on-creator.changes
trunk/add-on-creator/src/AddOnCreator.ycp
trunk/add-on-creator/src/add-on-creator.ycp
trunk/add-on-creator/src/complex.ycp
trunk/add-on-creator/src/helps.ycp
Modified: trunk/add-on-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=50855&r1=50854&r2=50855&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Tue Sep 9 11:09:56 2008
@@ -1 +1 @@
-2.17.3
+2.17.4
Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=50855&r1=50854&r2=50855&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Tue Sep 9 11:09:56 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Sep 9 11:06:40 CEST 2008 - jsuchome@suse.cz
+
+- merged proofread texts
+- removed some obsoleted content file keys
+- 2.17.4
+
+-------------------------------------------------------------------
Tue Aug 5 12:46:55 CEST 2008 - jsuchome@suse.cz
- recreate package metadata after signing RPMs (bnc#412591)
Modified: trunk/add-on-creator/src/AddOnCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=50855&r1=50854&r2=50855&view=diff
==============================================================================
--- trunk/add-on-creator/src/AddOnCreator.ycp (original)
+++ trunk/add-on-creator/src/AddOnCreator.ycp Tue Sep 9 11:09:56 2008
@@ -149,6 +149,7 @@
"value" : "1",
"mandatory" : true,
],
+ /*
"DISTPRODUCT" : $[
"key" : "DISTPRODUCT",
// label of content file key
@@ -166,6 +167,7 @@
"value" : "1",
"mandatory" : true,
],
+ */
"VENDOR" : $[
"key" : "VENDOR",
// label of content file key
@@ -174,16 +176,6 @@
"help" : _("Vendor name (free form)."),
"mandatory" : true,
],
- "REQUIRES" : $[
- "key" : "REQUIRES",
- // label of content file key
- "label" : _("Resolvables that must be installed"),
- // help text for content file 'REQUIRES' key
- "help" : _("<p>Resolvables that must be installed on the system to meet the needs of this product.</p>
-<p>This is a space-separated list of names or <tt>kind:name</tt> pairs optionally followed by version constraints. Just a name denotes a dependency to a package, such as <tt>sles-release</tt> or <tt>sles-release-10</tt>. The kind can be package, pattern, or product, such as <tt>pattern:basesystem</tt>.</p>"),
- "mandatory" : true,
-//TODO editor...
- ],
"DESCRDIR" : $[
"key" : "DESCRDIR",
// label of content file key
@@ -202,6 +194,7 @@
"value" : "suse",
"mandatory" : true,
],
+ /*
"DEFAULTBASE" : $[
"key" : "DEFAULTBASE",
// label of content file key
@@ -212,13 +205,7 @@
"type" : "combo",
"allowed_values" : allowed_archs,
],
- "PREREQUIRES" : $[
- "key" : "PREREQUIRES",
- // labeliption of content file PREREQUIRES key
- "label" : _("Resolvables needed before installation"),
- // help text for content file 'PREREQUIRES' key
- "help" : _("Resolvables that must be installed on the system before the installation of this product. The syntax is the same as for <b>REQUIRES</b>."),
- ],
+ */
"LABEL" : $[
"key" : "LABEL",
// label of content file key
@@ -226,6 +213,23 @@
// help text for content file '' key
"help" : _("UTF-8 encoded label. Default label if <b>LINGUAS</b> is omitted or no default language can be determined."),
],
+ /*
+ "REQUIRES" : $[
+ "key" : "REQUIRES",
+ // label of content file key
+ "label" : _("Resolvables that must be installed"),
+ // help text for content file 'REQUIRES' key
+ "help" : _("<p>Resolvables that must be installed on the system to meet the needs of this product.</p>
+<p>This is a space-separated list of names or <tt>kind:name</tt> pairs optionally followed by version constraints. Just a name denotes a dependency to a package, such as <tt>sles-release</tt> or <tt>sles-release-10</tt>. The kind can be package, pattern, or product, such as <tt>pattern:basesystem</tt>.</p>"),
+ "mandatory" : true,
+ ],
+ "PREREQUIRES" : $[
+ "key" : "PREREQUIRES",
+ // labeliption of content file PREREQUIRES key
+ "label" : _("Resolvables needed before installation"),
+ // help text for content file 'PREREQUIRES' key
+ "help" : _("Resolvables that must be installed on the system before the installation of this product. The syntax is the same as for <b>REQUIRES</b>."),
+ ],
"PROVIDES" : $[
"key" : "PROVIDES",
// label of content file PROVIDES key
@@ -275,6 +279,7 @@
// help text for content file 'ENHANCES' key
"help" : _("A reverse <b>SUGGESTS</b>. This product can be installed if this capability is provided by an installed resolvable. It is just a hint for an application. For example, <i>SuSEplugger</i> can suggest packages for installation if specific hardware is found."),
],
+ */
"LINGUAS" : $[
"key" : "LINGUAS",
// label of content file 'LINGUAS' key
@@ -337,6 +342,7 @@
"help" : _("UTF-8-encoded <b>LABEL</b>. <tt>lang</tt> has the same syntax as the <b>LINGUAS</b> values. For each language in <b>LINGUAS</b>, a matching <b>LABEL.lang</b> is expected."),
"helplabel" : "LABEL.lang",
],
+ /*
"ARCH" : $[
// label of content file ARCH.base key
"label" : _("Allowed architectures"),
@@ -345,6 +351,7 @@
"helplabel" : "ARCH.base",
"mandatory" : true
],
+ */
];
@@ -555,7 +562,7 @@
],
"Pob" : $[
// label for 'Pob' pattern key
- "label" : _("Obsoleted packages"),
+ "label" : _("Obsolete packages"),
"type" : "package-list",
"defval" : [],
],
@@ -845,9 +852,12 @@
map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user");
if (out["stdout"]:"" != "0\n" && out["stdout"]:"" != "")
{
- // TODO use getenv builtin when it is available
+ // FIXME use getenv builtin when it is available
+ /*
out = (map) SCR::Execute (.target.bash_output, "echo $HOME");
string home = deletechars (out["stdout"]:"", "\n");
+ */
+ string home = getenv ("HOME");
if (home != "" && home != nil)
add_on_products_file = home + "/add_on_products.ycp";
}
@@ -899,6 +909,7 @@
return true;
}
+/*
// proposal for ARCH.* values (of content file)
// FIXME this won't work for other architectures...
global string ValueForArchitecture (string arch_dir) {
@@ -912,6 +923,7 @@
});
return val;
}
+*/
// read the content file given by file name
global list<map> ReadContentFile (string file_path) {
@@ -1342,15 +1354,14 @@
Progress::New (caption, " ", size (stages),
(list<string>) stages, (list<string>) steps,
// help text
- _("<b>Generating Data for Add-On</b><br>
-Please wait...
+ _("<b>Wait while generating data for add-on...</b><br/>
"));
Progress::NextStage();
map arch_map = $[];
string rpm_path = current_product["rpm_path"]:"";
- // 1. set the values for ARCH.*
+ // 1. find the used architectures
string cmd = sformat ("cd %1; find -maxdepth 1 -type d", rpm_path);
map out = $[];
if (rpm_path != "")
@@ -1362,7 +1373,7 @@
string arch_dir = splitdir[1]:"";
if (contains (allowed_archs, arch_dir))
{
- arch_map["ARCH." + arch_dir ] = ValueForArchitecture (arch_dir);
+// arch_map["ARCH." + arch_dir ] = ValueForArchitecture (arch_dir);
arch_directories = add (arch_directories, arch_dir);
}
});
@@ -1412,12 +1423,14 @@
entry["value"] = content_map[key]:"";
content = add (content, entry);
});
+ /*
map arch_skel = content_specials["ARCH"]:$[];
foreach (string key, string val, arch_map, {
arch_skel["key"] = key;
arch_skel["value"] = val;
content = add (content, arch_skel);
});
+ */
}
string required_rpm_path = current_product["required_rpm_path"]:"";
// 4. read the list of packages, not present on AddOn
@@ -1721,7 +1734,7 @@
if (cont == "")
{
cont = "/\t" +
- content_map["DISTPRODUCT"]:"" + " " +
+ content_map["PRODUCT"]:"" + " " +
content_map["VERSION"]:"";
}
SCR::Write (.target.string,
@@ -2383,8 +2396,8 @@
if (name == "")
name = sformat ("%1-%2-%3",
- tolower (content_map["DISTPRODUCT"]:content_map["PRODUCT"]:"addon"),
- content_map["DISTVERSION"]:"", content_map["DEFAULTBASE"]:"");
+ tolower (content_map["PRODUCT"]:"addon"),
+ content_map["VERSION"]:"", content_map["DEFAULTBASE"]:"");
if (!issubstring (name, ".iso"))
name = name + ".iso";
current_product["iso_name"] = name; // ??
Modified: trunk/add-on-creator/src/add-on-creator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creator.ycp?rev=50855&r1=50854&r2=50855&view=diff
==============================================================================
--- trunk/add-on-creator/src/add-on-creator.ycp (original)
+++ trunk/add-on-creator/src/add-on-creator.ycp Tue Sep 9 11:09:56 2008
@@ -466,7 +466,7 @@
if (size (add_on_products) == 0)
{
// command line message, do not translate 'create', 'clone'
- Report::Error (_("There is no add-on product configuration present. Create a new one using 'create' or 'clone' command."));
+ Report::Error (_("There is no add-on product configuration present. Create a new one using the 'create' or 'clone' commands."));
return false;
}
integer number = options["number"]:0;
@@ -477,7 +477,7 @@
else
{
// error message
- Report::Error (_("Specify add-on product that should be built."));
+ Report::Error (_("Specify the add-on product that should be built."));
return false;
}
}
@@ -519,7 +519,7 @@
if (number < 1)
{
// error message
- Report::Error (_("Specify add-on product configuration that should be deleted."));
+ Report::Error (_("Specify the add-on product configuration that should be deleted."));
return false;
}
// !!! numbers are shown starting from 1, list is indexed from 0 !!!
@@ -538,12 +538,12 @@
"create" : $[
"handler" : CreateAddOn,
// command line help text for 'create' action
- "help" : _("Create and build new add-on product"),
+ "help" : _("Create and build a new add-on product."),
],
"clone" : $[
"handler" : CloneAddOn,
// command line help text for 'clone' action
- "help" : _("Create and build new add-on product based on an existing one"),
+ "help" : _("Create and build a new add-on product based on an existing one."),
],
"sign" : $[
"handler" : SignAddOn,
@@ -553,17 +553,17 @@
"list" : $[
"handler" : ListAddOns,
// command line help text for 'list' action
- "help" : _("List available add-on product configurations"),
+ "help" : _("List available add-on product configurations."),
],
"build" : $[
"handler" : BuildAddOnHandler,
// command line help text for 'create' action
- "help" : _("Build add-on product from selected configuration"),
+ "help" : _("Build an add-on product from the selected configuration."),
],
"delete" : $[
"handler" : DeleteAddOn,
// command line help text for 'create' action
- "help" : _("Delete selected add-on product configuration"),
+ "help" : _("Delete the selected add-on product configuration."),
],
],
"options" : $[
@@ -679,12 +679,12 @@
],
"number" : $[
// help text for 'number' option; do not translate 'list'
- "help" : _("Number of selected add-on (see 'list' command for product numbers)"),
+ "help" : _("Number of the selected add-on (see 'list' command for product numbers)."),
"type" : "integer"
],
"changelog" : $[
// command line help text for 'changelog' option
- "help" : _("Generate Changelog file"),
+ "help" : _("Generate a Changelog file."),
],
],
"mappings" : $[
Modified: trunk/add-on-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=50855&r1=50854&r2=50855&view=diff
==============================================================================
--- trunk/add-on-creator/src/complex.ycp (original)
+++ trunk/add-on-creator/src/complex.ycp Tue Sep 9 11:09:56 2008
@@ -141,16 +141,16 @@
}
// help text
- string help_text = _("<p>Start the creating of new add-on product configuration with <b>Add</b>.</p>") +
+ string help_text = _("<p>Start creating a new add-on product configuration with <b>Add</b>.</p>") +
// help text
- _("<p>Use <b>Edit</b> to modify selected add-on product configuration.</p>") +
+ _("<p>Use <b>Edit</b> to modify the selected add-on product configuration.</p>") +
// help text
_("<p>Delete the selected configuration using <b>Delete</b>.</p>") +
// help text
- _("<p>Build the fresh add-on product based on selected configuration with <b>Build</b>.</p>");
+ _("<p>Build the fresh add-on product based on the selected configuration with <b>Build</b>.</p>");
term contents = `VBox (
`VWeight (3, `Table (`id (`table), `opt (`notify, `immediate),
@@ -376,6 +376,7 @@
map current_product = AddOnCreator::current_product;
+// FIXME handle REQUIRES in new product-specific package
string requires = AddOnCreator::content_map["REQUIRES"]:"";
if (requires == "")
requires = "product:openSUSE = 11.0";
@@ -575,12 +576,6 @@
AddOnCreator::content_map["REQUIRES"] = requires;
AddOnCreator::content_map["PRODUCT"] = product;
AddOnCreator::content_map["VERSION"] = version;
- if (product != "" &&
- AddOnCreator::content_map["DISTPRODUCT"]:"" == "")
- AddOnCreator::content_map["DISTPRODUCT"] = product;
- if (version != "" &&
- AddOnCreator::content_map["DISTVERSION"]:"" == "")
- AddOnCreator::content_map["DISTVERSION"] = version;
/* FIXME does this make a sense???
we need to generate again when editing previous project
@@ -622,12 +617,12 @@
string ValidateContentValue (string key, any val) {
string sval = sformat ("%1", val);
- if (key == "DISTPRODUCT")
+ if (key == "PRODUCT")
{
if (deletechars (sval, String::CAlnum() + ".~_-") != "" )
{
// error popup (input validation failed)
- return _("The value of DISTPRODUCT may contain only
+ return _("The value of PRODUCT may contain only
letters, numbers, and the characters \".~_-\".");
}
}
@@ -637,22 +632,24 @@
map AddContentValue (list conflicts) {
map ret = $[];
+ /*
list allowed_archs = filter (string arch, AddOnCreator::allowed_archs, {
return !contains (conflicts, "ARCH." + arch);
});
+ */
list allowed_langs = filter (string l, AddOnCreator::GetLangCodes (true),{
return !contains (conflicts, "LABEL." + l);
});
- string help = mergestring (maplist (string k, ["ARCH", "LABEL"], {
- return sformat ("<p><b>%1</b></p>%2",
- AddOnCreator::content_specials[k,"helplabel"]:"",
- AddOnCreator::content_specials[k,"help"]:"");
- }), "<br>");
+// string help = mergestring (maplist (string k, ["ARCH", "LABEL"], {
+ string help = sformat ("<p><b>%1</b></p>%2<br>",
+ AddOnCreator::content_specials["LABEL","helplabel"]:"",
+ AddOnCreator::content_specials["LABEL","help"]:"");
UI::OpenDialog (`opt(`decorated), `HBox(
`HSpacing(1),
`VBox(
`VSpacing (0.5),
+ /*
`RadioButtonGroup (`id(`rd), `Left(`VBox (
`Left (`RadioButton(`id("ARCH"), `opt (`notify),_("&ARCH"),true)),
allowed_archs == [] ? `VSpacing (0) :
@@ -670,6 +667,10 @@
allowed_langs))
)
))),
+ */
+ `Label (_("LABEL")),
+ // combo label
+ `Left (`ComboBox (`id(`lang), _("La&nguage Code"), allowed_langs)),
// textentry label
`TextEntry (`id(`val), _("&Value"), ""),
`HBox(
@@ -680,6 +681,7 @@
),
`HSpacing(1)
));
+ /*
if (allowed_archs != [])
{
UI::ChangeWidget (`id(`lang), `Enabled, false);
@@ -689,6 +691,7 @@
UI::ChangeWidget (`id("ARCH"), `Enabled, false);
UI::ChangeWidget (`id(`rd), `Value, "LABEL");
}
+ */
UI::SetFocus (`id(`val));
while (true)
{
@@ -698,12 +701,14 @@
ret = $[];
break;
}
+ /*
string but = (string) UI::QueryWidget (`id(`rd), `Value);
if (result == "ARCH" || result == "LABEL")
{
UI::ChangeWidget (`id(`lang), `Enabled, result == "LABEL");
UI::ChangeWidget (`id(`base), `Enabled, result == "ARCH");
}
+ */
if (result == `help)
{
// Heading for help popup window
@@ -711,11 +716,14 @@
}
if (result == `ok)
{
+ /*
string key = sformat ("%1.%2", but, but == "ARCH" ?
UI::QueryWidget (`id(`base), `Value) :
UI::QueryWidget (`id(`lang), `Value));
- ret = union (AddOnCreator::content_specials[but]:$[], $[
- "key" : key,
+ */
+ ret = union (AddOnCreator::content_specials["LABEL"]:$[], $[
+ "key" : sformat ("LABEL.%1",
+ UI::QueryWidget (`id(`lang), `Value)),
"value" : UI::QueryWidget (`id(`val), `Value)
]);
break;
@@ -756,7 +764,6 @@
});
return ret;
}
-// TODO: editor for REQUIRES: read patterns available on target...
term contents = `HBox (`HSpacing (), `VBox (
`Table (`id(`content_table), `opt(`notify), `header (
@@ -853,15 +860,19 @@
}
else if (ret == `next) {
list<string> missing = [];
+ /*
boolean arch_present = false;
string default_base = "";
+ */
foreach (map entry, content, {
if (entry["value"]:"" == "" && entry["mandatory"]:false)
missing = add (missing, entry["key"]:"");
+ /*
if (substring (entry["key"]:"",0,4) == "ARCH")
arch_present = true;
if (entry["key"]:"" == "DEFAULTBASE")
default_base = entry["value"]:"";
+ */
});
if (missing != [])
{
@@ -870,6 +881,7 @@
%1"), mergestring (missing, "\n")));
continue;
}
+ /*
if (!arch_present)
{
// we should not get here, because ARCH's are created
@@ -879,18 +891,19 @@
"value": AddOnCreator::ValueForArchitecture (default_base)
], AddOnCreator::content_specials["ARCH"]:$[]));
}
+ */
integer i = 0;
integer index = -1;
- string distproduct = "";
+ string product = "";
foreach (map entry, content, {
if (entry["key"]:"" == "LABEL" && entry["value"]:"" == "")
index = i;
- if (entry["key"]:"" == "DISTPRODUCT")
- distproduct = entry["value"]:"";
+ if (entry["key"]:"" == "PRODUCT")
+ product = entry["value"]:"";
i = i + 1;
});
if (index != -1)
- content[index,"value"] = distproduct;
+ content[index,"value"] = product;
AddOnCreator::content = content;
AddOnCreator::UpdateContentMap (content);
break;
@@ -1734,9 +1747,17 @@
string iso_name = current_product["iso_name"]:"";
if (iso_name == "")
+ iso_name = sformat ("%1-%2",
+ tolower (content_map["PRODUCT"]:""),
+ content_map["VERSION"]:""
+ );
+ /*
iso_name = sformat ("%1-%2-%3",
- tolower (content_map["DISTPRODUCT"]:""),
- content_map["DISTVERSION"]:"", content_map["DEFAULTBASE"]:"");
+ tolower (content_map["PRODUCT"]:""),
+ content_map["VERSION"]:"",
+ content_map["DEFAULTBASE"]:""
+ );
+ */
term contents = `HBox (`HSpacing (), `VBox (
`HBox (
Modified: trunk/add-on-creator/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/helps.ycp?rev=50855&r1=50854&r2=50855&view=diff
==============================================================================
--- trunk/add-on-creator/src/helps.ycp (original)
+++ trunk/add-on-creator/src/helps.ycp Tue Sep 9 11:09:56 2008
@@ -42,9 +42,8 @@
"),
// Write dialog help
- "write" : _("<p>Writing add-on configurations<br>
-Please wait...<br></p>
-"),
+ "write" : _("<p>Writing the add-on configurations<br>
+Please wait...<br></p>\n"),
// help text for start menu
"start" : _("<p>This module offers guidance for the creation of an add-on product.</p>") +
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
