Merge remote-tracking branch 'origin/pr/2'

Conflicts: package/yast2-ldap-server.changes
yast · Jul 29, 2013 · c15e57e · c15e57e
2 parents 83a117c + 3c912d3
commit c15e57e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/package/yast2-ldap-server.changes b/package/yast2-ldap-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 29 11:02:52 UTC 2013 - varkoly@suse.com
+
+- bnc#777449 - Puzzlestring in yasts ldap server module (ldap-server.pot)
+- bnc#757132 - Puzzle-String in ldap-server module
+
 -------------------------------------------------------------------
 Tue Jul  2 11:44:46 UTC 2013 - varkoly@suse.com
 

diff --git a/src/LdapDatabase.ycp b/src/LdapDatabase.ycp
@@ -323,9 +323,8 @@
                 {
                     map<string, string> err = LdapServer::ReadError();
                     boolean res = Popup::AnyQuestion(Label::WarningMsg(),
-                                        _("The Base Object: \"") + db["suffix"]:"" +
-                                        _("\" can not be auto created by YaST.\n") +
-                                        err["msg"]:"",
+                                        sformat(_("The Base Object: \"%1\" cannot be auto created by YaST:\n%2"),
+                                            db["suffix"]:"", err["msg"]:""),
                                         Label::OKButton(), Label::CancelButton(), `focus);
                     if ( res == false ) {
                         continue;

diff --git a/src/LdapServer.pm b/src/LdapServer.pm
@@ -1519,7 +1519,7 @@ sub WriteTlsConfig
         {
             $self->SetError(_("Can not set a filesystem ACL on the private key."),
                                    "setfacl -m u:ldap:r ".$tls->{'certKeyFile'}." failed.\n".
-                                   "Do you have filesystem acl support disabled?" );
+                                   _("Do you have filesystem acl support disabled?") );
             return 0;
         }
     }
@@ -2554,7 +2554,7 @@ sub CheckSuffixAutoCreate
     if(!defined $attr[0] || !defined $val)
     {
         y2error("Error while extracting RDN values");
-        $self->SetError( _("Invalid LDAP DN: \""). $suffix. _("\", cannot extract RDN values"));
+        $self->SetError( sprintf(_("Invalid LDAP DN: \"%s\", cannot extract RDN values"),$suffix), "");
         return -1;
     }
     if( (lc($attr[0]) eq "ou") || ( lc($attr[0]) eq "o") || ( lc($attr[0]) eq "l") ||
@@ -2581,12 +2581,12 @@ sub CheckDatabase
     y2milestone("CheckDatabase");
     my $suffix_object = X500::DN->ParseRFC2253($db->{'suffix'});
     if(! defined $suffix_object) {
-        $self->SetError( _("Base DN") ." \"". $db->{'suffix'} ."\" ". _("is not a valid LDAP DN."), "");
+        $self->SetError( sprintf(_("Base DN \"%s\" is not a valid LDAP DN."),$db->{'suffix'}), "");
         return 0;
     }
     elsif ( $suffix_object->hasMultivaluedRDNs() )
     {
-        $self->SetError( _("Base DN") ." \"". $db->{'suffix'} ."\" ". _("has multivalued RDNs (not supported by YaST)."), "");
+        $self->SetError( sprintf(_("Base DN \"%s\" has multivalued RDNs (not supported by YaST)."),$db->{'suffix'}), "");
         return 0;
     }
 
@@ -2595,13 +2595,12 @@ sub CheckDatabase
     {
         my $object = X500::DN->ParseRFC2253($db->{'rootdn'});
         if(! defined $object) {
-            $self->SetError(_("Root DN"). " \"". $db->{'rootdn'} ."\" ". _("is not a valid LDAP DN."), "");
+            $self->SetError( sprintf(_("Root DN \"%s\" is not a valid LDAP DN."),$db->{'rootdn'}), "");
             return 0;
         }
         elsif ( $object->hasMultivaluedRDNs() )
         {
-            $self->SetError(_("Root DN"). " \"". $db->{'rootdn'} ."\" ". 
-                            _("has multivalued RDNs (not supported by YaST)."), "");
+            $self->SetError( sprintf(_("Root DN \"%s\" has multivalued RDNs (not supported by YaST)."),$db->{'rootdn'}), "");
             return 0;
         }
 
@@ -3402,7 +3401,7 @@ sub VerifyTlsSetup
     y2milestone("TlsConfig ". Data::Dumper->Dump([$tls]) );
     if ( SCR->Read(".target.size", $tls->{"caCertFile"}) <= 0)
     {
-        $self->SetError( _("CA Certificate File: \"") .  $tls->{"caCertFile"}. _("\" does not exist."), "");
+        $self->SetError( sprintf(_("CA Certificate File: \"%s\" does not exist."),$tls->{"caCertFile"}), "");
         return 0;
     }
     else
@@ -3413,20 +3412,20 @@ sub VerifyTlsSetup
         if ( $rc->{'exit'} != 0 )
         {
             $self->SetError( _("Error while trying to verify the server certificate of the provider server.\n").
-                             _("Please make sure that \"".$tls->{"caCertFile"}."\" contains the correct\nCA file to verify the remote Server Certificate."),
+                             sprintf(_("Please make sure that \"%s\" contains the correct\nCA file to verify the remote Server Certificate."),$tls->{"caCertFile"}),
                              $rc->{'stderr'} );
             return 0;
         }
     }
 
     if ( SCR->Read(".target.size", $tls->{"certFile"}) <= 0)
     {
-        $self->SetError( _("Certificate File: \""). $tls->{"certFile"}. _(\" does not exist."), "" );
+        $self->SetError( sprintf(_("Certificate File: \"%s\" does not exist."),$tls->{"certFile"}), "" );
         return 0;
     }
     if ( SCR->Read(".target.size", $tls->{"certKeyFile"}) <= 0)
     {
-        $self->SetError( _("Certificate Key File: \""). $tls->{"certKeyFile"} . _("\" does not exist."), "");
+        $self->SetError( sprintf(_("Certificate Key File: \"%s\" does not exist."),$tls->{"certKeyFile"}), "" );
         return 0;
     }
     return 1;

diff --git a/src/mirrormode-wizard.ycp b/src/mirrormode-wizard.ycp
@@ -116,9 +116,7 @@ any MirrorModeOverview()
                     continue;
                 }
 
-                if( Popup::YesNo( _("Do you really want to remove ") +
-                                  "\"" + serverids[ selected, "uri" ]:"" + "\"" +
-                                  _("from the MirrorMode setup?\n") +
+                if( Popup::YesNo( sformat(_("Do you really want to remove \"%1\" from the MirrorMode setup?\n"),serverids[ selected, "uri" ]:"") +
                                   _("Changes will take effect immediately after clicking \"Yes\"") ) )
                 {
                     LdapServer::RemoveMMSyncrepl( serverids[ selected, "uri" ]:"" );