November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59708 - /trunk/apparmor/src/perl/Notify.pm
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 15:50:25 2009 New Revision: 59708 URL: http://svn.opensuse.org/viewcvs/yast?rev=59708&view=rev Log: correct condition (bnc#531512) Modified: trunk/apparmor/src/perl/Notify.pm Modified: trunk/apparmor/src/perl/Notify.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/perl/Notify.pm?rev=… ============================================================================== --- trunk/apparmor/src/perl/Notify.pm (original) +++ trunk/apparmor/src/perl/Notify.pm Mon Nov 23 15:50:25 2009 @@ -167,8 +167,8 @@ next; } } elsif ( $val eq $level ) { - if ( ! ($config->{$type}->{$val} =~ /\d\d/ && - $config->{$type}->{$val} < 11) ) { + if ( ($config->{$type}->{$val} =~ /\d\d/ && + $config->{$type}->{$val} > 10) ) { $config->{$type}->{$val} = 0; } } elsif ( $val eq $unk ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59707 - /trunk/apparmor/src/include/subdomain/helps.ycp
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 15:49:15 2009 New Revision: 59707 URL: http://svn.opensuse.org/viewcvs/yast?rev=59707&view=rev Log: Confusing phrase-- Modified: trunk/apparmor/src/include/subdomain/helps.ycp Modified: trunk/apparmor/src/include/subdomain/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/h… ============================================================================== --- trunk/apparmor/src/include/subdomain/helps.ycp (original) +++ trunk/apparmor/src/include/subdomain/helps.ycp Mon Nov 23 15:49:15 2009 @@ -85,7 +85,7 @@ by using the suggestions made by AppArmor.") + _("AppArmor suggests that you allow or deny access to specific resources -or define execute permission for entries. These questions +or define execute permission for entries. Questions that display were logged during the normal application execution test previously performed. <br>") + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59706 - in /trunk/packager: package/yast2-packager.changes src/clients/webpin_package_search.ycp
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 15:17:35 2009 New Revision: 59706 URL: http://svn.opensuse.org/viewcvs/yast?rev=59706&view=rev Log: marked for translation Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/webpin_package_search.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Nov 23 15:17:35 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 23 15:15:44 CET 2009 - kmachalkova(a)suse.cz + +- Webpin: Remaining string marked for translation (bnc#549945) + +------------------------------------------------------------------- Mon Nov 23 09:05:47 CET 2009 - lslezak(a)suse.cz - repositories - fixed the help text to match the current layout Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_pack… ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Mon Nov 23 15:17:35 2009 @@ -227,7 +227,7 @@ `VBox ( `HBox ( `VBox( - `MinWidth(20, `InputField (`id ("search_text"), `opt (`hstretch), "Search &Expression")), + `MinWidth(20, `InputField (`id ("search_text"), `opt (`hstretch), _("Search &Expression"))), // TRANSLATORS: push button `Left(`PushButton (`id ("search"), _("&Search"))), `VStretch() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59705 - /tags/branch-Code-11-SP1-2_17_4/control-center/
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 14:46:21 2009 New Revision: 59705 URL: http://svn.opensuse.org/viewcvs/yast?rev=59705&view=rev Log: Created tag branch-Code-11-SP1-2_17_4 for control-center Added: tags/branch-Code-11-SP1-2_17_4/control-center/ (props changed) - copied from r59704, branches/SuSE-Code-11-SP1-Branch/control-center/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59704 - in /branches/SuSE-Code-11-SP1-Branch/control-center: VERSION package/yast2-control-center.changes
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 14:46:14 2009 New Revision: 59704 URL: http://svn.opensuse.org/viewcvs/yast?rev=59704&view=rev Log: version 2.17.4 Modified: branches/SuSE-Code-11-SP1-Branch/control-center/VERSION branches/SuSE-Code-11-SP1-Branch/control-center/package/yast2-control-center.changes Modified: branches/SuSE-Code-11-SP1-Branch/control-center/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/contr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/control-center/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/control-center/VERSION Mon Nov 23 14:46:14 2009 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-SP1-Branch/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/contr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/control-center/package/yast2-control-center.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/control-center/package/yast2-control-center.changes Mon Nov 23 14:46:14 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 23 14:41:14 CET 2009 - kmachalkova(a)suse.cz + +- Backport of fallback icon directory (/usr/share/icons/hicolor) + support (FaTE#306356) +- V 2.17.4 + +------------------------------------------------------------------- Wed Nov 19 13:05:31 CET 2008 - sh(a)suse.de - Fixed bnc #445781: Module groups not translated -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59703 - in /branches/SuSE-Code-11-SP1-Branch/control-center/src: Makefile.am y2controlcenterview.cpp y2controlcenterview.h
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 14:26:56 2009 New Revision: 59703 URL: http://svn.opensuse.org/viewcvs/yast?rev=59703&view=rev Log: Backport of FaTE#306356 - icons/hicolor as fallback Modified: branches/SuSE-Code-11-SP1-Branch/control-center/src/Makefile.am branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.cpp branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.h Modified: branches/SuSE-Code-11-SP1-Branch/control-center/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/contr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/control-center/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/control-center/src/Makefile.am Mon Nov 23 14:26:56 2009 @@ -4,6 +4,7 @@ AM_CXXFLAGS = \ -DICON_DIR=\"${themedir}/current/icons/32x32/apps\" \ + -DFALLBACK_ICON_DIR=\"${prefix}/share/icons/hicolor/32x32/apps\" \ -DPIXMAP_DIR=\"${themedir}/current/control-center\" \ -DMODULES_DESKTOP_DIR=\"${desktopdir}\" \ -DGROUPS_DESKTOP_DIR=\"${desktopdir}/groups\" \ Modified: branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/contr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.cpp (original) +++ branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.cpp Mon Nov 23 14:26:56 2009 @@ -104,6 +104,8 @@ _listBox->setFocus(); + addIconPath( ICON_DIR ); + addIconPath( FALLBACK_ICON_DIR ); // // IconView for the Module Icons @@ -280,7 +282,6 @@ void Y2ControlCenterView::slotInitListBox() { QString icon,groupname; - QString icondir = ICON_DIR "/"; int i = 0; int firstenabled = -1; @@ -296,8 +297,9 @@ { icon = ptr->getIcon(); groupname = ptr->getName(); + QString iconpath = findIcon( icon ); - QImage img = QPixmap( icondir + icon ).convertToImage(); + QImage img = QPixmap( iconpath ).convertToImage(); // draw border around icon because we want more space between the icons img = img.copy( -1 * GROUP_ICON_HORIZ_BORDER , // x @@ -490,10 +492,9 @@ const YMod* m = group->first (); while (m) { - QString iconfile = ICON_DIR "/"; - iconfile += m->getIcon (); + QString iconpath = findIcon( m->getIcon()); - QPixmap pixmap (iconfile); + QPixmap pixmap (iconpath); #if 0 if (pixmap.isNull ()) qDebug ("failed to load icon %s", (const char*) iconfile); @@ -507,6 +508,29 @@ } } +void Y2ControlCenterView::addIconPath( const QString &dir ) +{ + icon_dirs << dir; +} + +QString Y2ControlCenterView::findIcon( QString icon ) +{ + if ( iconFileCache.find( icon ) != iconFileCache.end() ) { + return iconFileCache[ icon ]; + } + + for (QStringList::Iterator it = icon_dirs.begin(); it != icon_dirs.end(); it++) + { + QString icondir = *it; + if ( QFile::exists(icondir + "/" + icon) ) + { + iconFileCache.insert( icon, icondir + "/" + icon ); + return QString(icondir + "/" + icon); + } + } + + return QString(); +} void Y2ControlCenterView::slotButtonClicked(int id) { @@ -567,7 +591,6 @@ return; _items->clear(); - QString icondir = ICON_DIR "/"; if (!text.isEmpty()) { _searchDialog->ClearResults(); @@ -585,8 +608,9 @@ if (m->getName().contains(QRegExp(text,false,false)) || \ m->getDescription().contains(QRegExp(text,false,false))) { + QString iconpath = findIcon( m->getIcon() ); // cout << "Found: " << m->getName() << "(" <<i << ")" << endl; - _searchDialog->SearchResult(new QListBoxPixmap(QPixmap(icondir + m->getIcon()),m->getName())); + _searchDialog->SearchResult(new QListBoxPixmap(QPixmap( iconpath ),m->getName())); if (_items->size()<=i) { _items->resize(i+1); Modified: branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/contr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.h (original) +++ branches/SuSE-Code-11-SP1-Branch/control-center/src/y2controlcenterview.h Mon Nov 23 14:26:56 2009 @@ -61,6 +61,8 @@ QWidget * layoutTitleBar( QWidget * parent ); void setGradient( QWidget * widget, const QPixmap & pixmap ); void fillIconView( int group_id ); + void addIconPath( const QString &dir ); + QString findIcon( QString icon ); private: @@ -70,6 +72,9 @@ QListBox * _listBox; MyQIconView * _iconView; SearchDialog * _searchDialog; + + QStringList icon_dirs; + QMap <QString, QString> iconFileCache; const QString * error; const YMod * lastCalledModule; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59702 - in /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src: MdPartCo.cc Storage.cc
by mpatelcz＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: mpatelcz Date: Mon Nov 23 14:25:34 2009 New Revision: 59702 URL: http://svn.opensuse.org/viewcvs/yast?rev=59702&view=rev Log: BZ 554143 - support udev ids for mdpart. Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Mon Nov 23 14:25:34 2009 @@ -1006,10 +1006,21 @@ void MdPartCo::setUdevData(const list<string>& id) { + y2mil("disk:" << nm << " id:" << id); + udev_id = id; + //this strange line will actually remove anything that doesn't start with "md-uuid-" string. + udev_id.erase(remove_if(udev_id.begin(), udev_id.end(), find_begin("md-uuid-")), udev_id.end()); + udev_id.sort(); + y2mil("id:" << udev_id); if (disk) { disk->setUdevData("", id); } + MdPartPair pp = mdpartPair(); + for( MdPartIter p=pp.begin(); p!=pp.end(); ++p ) + { + p->addUdevData(); + } } @@ -1126,7 +1137,7 @@ log += " MD-UUID:" + md_uuid + "-->" + d.md_uuid; if( md_name!=d.md_name ) { - log += " MDName:" + md_uuid + "-->" + d.md_uuid; + log += " MDName:" + md_name + "-->" + d.md_name; } if( destrSb!=d.destrSb ) { Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Mon Nov 23 14:25:34 2009 @@ -444,12 +444,18 @@ list<string> l = MdPartCo::getMdRaids(); list<string> mdpartlist = MdPartCo::filterMdPartCo(l,ppart, instsys()); // + map<string, list<string>> by_id; + getUdevMap("/dev/disk/by-id", by_id); for( list<string>::const_iterator i = mdpartlist.begin(); i != mdpartlist.end(); i++) { MdPartCo * v = new MdPartCo( this, *i, &ppart ); - // check for valid? + list<string> nm = by_id[v->name()]; + if( !nm.empty() ) + { + v->setUdevData(nm); + } addToList( v ); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : moved fetch_po to an own task in the top level Rakefile
by Stefan Schubert 23 Nov '09

23 Nov '09

ref: refs/heads/master commit 1a2a92a6252478730fd3d7e6f0be5c35e2d44663 Author: Stefan Schubert <schubi(a)suse.de> Date: Mon Nov 23 13:57:01 2009 +0100 moved fetch_po to an own task in the top level Rakefile --- Rakefile | 84 ++++++++++++++++++++++++++------------ webclient/lib/tasks/gettext.rake | 27 ------------ 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/Rakefile b/Rakefile index 21f8667..042a48c 100644 --- a/Rakefile +++ b/Rakefile @@ -8,42 +8,74 @@ desc 'Run all tests by default' task :default => :test -%w(fetch_po makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| +%w(makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| desc "Run #{task_name} task for all projects" - task task_name do - #remove translation statistik - File.delete(File.join("pot", "translation_status.yaml")) if task_name == "fetch_po" && File.exist?("pot/translation_status.yaml") - PROJECTS.each do |project| system %(cd #{project} && #{env} #{$0} #{task_name}) raise "Error on execute task #{task_name} on #{project}" if $?.exitstatus != 0 end + end +end - if task_name == "fetch_po" - #remove translations which have not at least 80 percent translated text - limit = Float(80) - result = Hash.new - result = YAML.load(File.open(File.join("pot", "translation_status.yaml"))) if File.exists?(File.join("pot", "translation_status.yaml")) - result.each {|key,value| - translated = un_translated = Float(0) - translated = value["translated"].to_f if value.has_key? "translated" - un_translated += value["untranslated"].to_f if value.has_key? "untranslated" - un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" - limit_eval = translated/(un_translated+translated) - if limit_eval < limit/100 - puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." - Dir.glob("**/#{key}/").each {|po_dir| - unless po_dir.include? "lang_helper" #do not delete translations for language selections -# puts "deleting #{po_dir}" -# remove_dir(po_dir, true) #force=true +desc "Fetch po files from lcn. Parameter: source directory of lcn e.g. ...lcn/trunk/webyast/" +task :fetch_po, [:lcn_dir] do |t, args| + args.with_defaults(:lcn_dir => File.join(File.dirname(__FILE__),"../../", "lcn", "trunk","webyast")) + #remove translation statistik + File.delete(File.join("pot", "translation_status.yaml")) if File.exist?("pot/translation_status.yaml") + result = Hash.new() + + PROJECTS.each do |project| + system %(cd #{project} && #{env} #{$0} fetch_po #{args.lcn_dir}) + raise "Error on execute task fetch_po on #{project}" if $?.exitstatus != 0 + + #collecting translation information + Dir.glob("#{project}/**/*.po").each {|po_file| + output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` + language = File.basename(File.dirname(po_file)) + output.split(",").each {|column| + value = column.split(" ") + if value.size > 2 + if result.has_key? language + if result[language].has_key? value[1] + result[language][value[1]] += value[0].to_i + else + result[language][value[1]] = value[0].to_i end - } - end - } - end + else + result[language] = Hash.new + result[language][value[1]] = value[0].to_i + end + end + } + } end + + #saving result to pot/translation_status.yaml + destdir = File.join(File.dirname(__FILE__), "pot") + Dir.mkdir destdir unless File.directory?(destdir) + f = File.open(File.join(destdir, "translation_status.yaml"), "w") + f.write(result.to_yaml) + f.close + #remove translations which have not at least 80 percent translated text + limit = Float(80) + result.each {|key,value| + translated = un_translated = Float(0) + translated = value["translated"].to_f if value.has_key? "translated" + un_translated += value["untranslated"].to_f if value.has_key? "untranslated" + un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" + limit_eval = translated/(un_translated+translated) + if limit_eval < limit/100 + puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." + Dir.glob("**/#{key}/").each {|po_dir| + unless po_dir.include? "lang_helper" #do not delete translations for language selections +# puts "deleting #{po_dir}" +# remove_dir(po_dir, true) #force=true + end + } + end + } end desc "Run doc to generate whole documentation" diff --git a/webclient/lib/tasks/gettext.rake b/webclient/lib/tasks/gettext.rake index d0a00dc..972de14 100644 --- a/webclient/lib/tasks/gettext.rake +++ b/webclient/lib/tasks/gettext.rake @@ -51,32 +51,5 @@ task :fetch_po, [:lcn_dir] do |t, args| FileUtils.cp(po_file, destfile) end } - result = Hash.new() - destdir = File.join(File.dirname(__FILE__),"../../..", "pot") - Dir.mkdir destdir unless File.directory?(destdir) - result = YAML.load(File.open(File.join(destdir, "translation_status.yaml"))) if File.exists?(File.join(destdir, "translation_status.yaml")) - - Dir.glob("{po}/**/*.po").each {|po_file| - output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` - language = File.basename(File.dirname(po_file)) - output.split(",").each {|column| - value = column.split(" ") - if value.size > 2 - unless result[language].blank? - unless result[language][value[1]].blank? - result[language][value[1]] += value[0].to_i - else - result[language][value[1]] = value[0].to_i - end - else - result[language] = Hash.new - result[language][value[1]] = value[0].to_i - end - end - } - } - f = File.open(File.join(destdir, "translation_status.yaml"), "w") - f.write(result.to_yaml) - f.close end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : moved fetch_po to an own task in the top level Rakefile
by Stefan Schubert 23 Nov '09

23 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 1a2a92a6252478730fd3d7e6f0be5c35e2d44663 Author: Stefan Schubert <schubi(a)suse.de> Date: Mon Nov 23 13:57:01 2009 +0100 moved fetch_po to an own task in the top level Rakefile --- Rakefile | 84 ++++++++++++++++++++++++++------------ webclient/lib/tasks/gettext.rake | 27 ------------ 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/Rakefile b/Rakefile index 21f8667..042a48c 100644 --- a/Rakefile +++ b/Rakefile @@ -8,42 +8,74 @@ desc 'Run all tests by default' task :default => :test -%w(fetch_po makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| +%w(makemo updatepot test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name| desc "Run #{task_name} task for all projects" - task task_name do - #remove translation statistik - File.delete(File.join("pot", "translation_status.yaml")) if task_name == "fetch_po" && File.exist?("pot/translation_status.yaml") - PROJECTS.each do |project| system %(cd #{project} && #{env} #{$0} #{task_name}) raise "Error on execute task #{task_name} on #{project}" if $?.exitstatus != 0 end + end +end - if task_name == "fetch_po" - #remove translations which have not at least 80 percent translated text - limit = Float(80) - result = Hash.new - result = YAML.load(File.open(File.join("pot", "translation_status.yaml"))) if File.exists?(File.join("pot", "translation_status.yaml")) - result.each {|key,value| - translated = un_translated = Float(0) - translated = value["translated"].to_f if value.has_key? "translated" - un_translated += value["untranslated"].to_f if value.has_key? "untranslated" - un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" - limit_eval = translated/(un_translated+translated) - if limit_eval < limit/100 - puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." - Dir.glob("**/#{key}/").each {|po_dir| - unless po_dir.include? "lang_helper" #do not delete translations for language selections -# puts "deleting #{po_dir}" -# remove_dir(po_dir, true) #force=true +desc "Fetch po files from lcn. Parameter: source directory of lcn e.g. ...lcn/trunk/webyast/" +task :fetch_po, [:lcn_dir] do |t, args| + args.with_defaults(:lcn_dir => File.join(File.dirname(__FILE__),"../../", "lcn", "trunk","webyast")) + #remove translation statistik + File.delete(File.join("pot", "translation_status.yaml")) if File.exist?("pot/translation_status.yaml") + result = Hash.new() + + PROJECTS.each do |project| + system %(cd #{project} && #{env} #{$0} fetch_po #{args.lcn_dir}) + raise "Error on execute task fetch_po on #{project}" if $?.exitstatus != 0 + + #collecting translation information + Dir.glob("#{project}/**/*.po").each {|po_file| + output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` + language = File.basename(File.dirname(po_file)) + output.split(",").each {|column| + value = column.split(" ") + if value.size > 2 + if result.has_key? language + if result[language].has_key? value[1] + result[language][value[1]] += value[0].to_i + else + result[language][value[1]] = value[0].to_i end - } - end - } - end + else + result[language] = Hash.new + result[language][value[1]] = value[0].to_i + end + end + } + } end + + #saving result to pot/translation_status.yaml + destdir = File.join(File.dirname(__FILE__), "pot") + Dir.mkdir destdir unless File.directory?(destdir) + f = File.open(File.join(destdir, "translation_status.yaml"), "w") + f.write(result.to_yaml) + f.close + #remove translations which have not at least 80 percent translated text + limit = Float(80) + result.each {|key,value| + translated = un_translated = Float(0) + translated = value["translated"].to_f if value.has_key? "translated" + un_translated += value["untranslated"].to_f if value.has_key? "untranslated" + un_translated += value["fuzzy"].to_f if value.has_key? "fuzzy" + limit_eval = translated/(un_translated+translated) + if limit_eval < limit/100 + puts "Language #{key} should be deleted cause it has only #{(limit_eval*100).to_i} percent translation reached." + Dir.glob("**/#{key}/").each {|po_dir| + unless po_dir.include? "lang_helper" #do not delete translations for language selections +# puts "deleting #{po_dir}" +# remove_dir(po_dir, true) #force=true + end + } + end + } end desc "Run doc to generate whole documentation" diff --git a/webclient/lib/tasks/gettext.rake b/webclient/lib/tasks/gettext.rake index d0a00dc..972de14 100644 --- a/webclient/lib/tasks/gettext.rake +++ b/webclient/lib/tasks/gettext.rake @@ -51,32 +51,5 @@ task :fetch_po, [:lcn_dir] do |t, args| FileUtils.cp(po_file, destfile) end } - result = Hash.new() - destdir = File.join(File.dirname(__FILE__),"../../..", "pot") - Dir.mkdir destdir unless File.directory?(destdir) - result = YAML.load(File.open(File.join(destdir, "translation_status.yaml"))) if File.exists?(File.join(destdir, "translation_status.yaml")) - - Dir.glob("{po}/**/*.po").each {|po_file| - output = `LANG=C msgfmt -o /dev/null -c -v --statistics #{po_file} 2>&1` - language = File.basename(File.dirname(po_file)) - output.split(",").each {|column| - value = column.split(" ") - if value.size > 2 - unless result[language].blank? - unless result[language][value[1]].blank? - result[language][value[1]] += value[0].to_i - else - result[language][value[1]] = value[0].to_i - end - else - result[language] = Hash.new - result[language][value[1]] = value[0].to_i - end - end - } - } - f = File.open(File.join(destdir, "translation_status.yaml"), "w") - f.write(result.to_yaml) - f.close end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59701 - in /branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines: lilolike.ycp misc.ycp
by juhliarik＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: juhliarik Date: Mon Nov 23 13:33:26 2009 New Revision: 59701 URL: http://svn.opensuse.org/viewcvs/yast?rev=59701&view=rev Log: added support for special MD RAIDs from Intel Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Mon Nov 23 13:33:26 2009 @@ -1304,6 +1304,29 @@ device_mapping[tmp] = "hd0"; }*/ } +/** + * Check if MD raid is build on disks not on paritions + * @param devices - list of devices from MD raid + * @param tm - unfiltered target map + * @return - true if MD RAID is build on disks (not on partitions) + */ + +boolean checkMDRaidDevices(list<string> devices, map<string,map> tm) +{ + boolean ret = true; + foreach (string key, devices, { + if (key != "" && ret) + { + if (tm[key]:nil != nil) + ret = true; + else + ret = false; + } + }); + return ret; +} + + /*** helper functions END ***/ /** @@ -1344,7 +1367,8 @@ // filter out non-disk devices targetMap = filter (string k, map v, targetMap, { return v["type"]:`CT_UNKNOWN==`CT_DMRAID || v["type"]:`CT_UNKNOWN==`CT_DISK - || v["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH; + || v["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH || + (v["type"]:`CT_UNKNOWN==`CT_MDPART && checkMDRaidDevices(v["devices"]:[], targetMap)); }); y2milestone ("Target map: %1", targetMap); Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Mon Nov 23 13:33:26 2009 @@ -882,7 +882,7 @@ ``(p["fstype"]:"" == "Linux native" || p["fstype"]:"" == "Extended" || p["fstype"]:"" == "Linux RAID" - || p["fstype"]:"" == "MD Raid")); + || tolower(p["fstype"]:"") == "md raid")); } list<string>partition_names = maplist (map p, partitions, ``((string)(p["device"]:""))); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0