jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1531322 - in /jmeter/trunk/src: core/org/apache/jmeter/resources/messages.properties core/org/apache/jmeter/resources/messages_fr.properties protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Date Fri, 11 Oct 2013 15:07:24 GMT
Author: milamber
Date: Fri Oct 11 15:07:24 2013
New Revision: 1531322

URL: http://svn.apache.org/r1531322
Log:
I18N and Localization for some pop-up message/error

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1531322&r1=1531321&r2=1531322&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri Oct 11 15:07:24
2013
@@ -723,6 +723,12 @@ proxy_content_type_filter=Content-type f
 proxy_content_type_include=Include\:
 proxy_daemon_bind_error=Could not create proxy - port in use. Choose another port.
 proxy_daemon_error=Could not create proxy - see log for details
+proxy_daemon_error_from_clipboard=from clipboard
+proxy_daemon_error_not_retrieve=Could not add retrieve
+proxy_daemon_error_read_args=Could not add read arguments from clipboard\:
+proxy_daemon_msg_check_details=Please check the details below when installing the certificate
in the browser
+proxy_daemon_msg_created_in_bin=created in JMeter bin directory
+proxy_daemon_msg_rootca_cert=Root CA certificate\:
 proxy_domains=HTTPS Domains \:
 proxy_domains_dynamic_mode_tooltip=List of domain names for HTTPS url, ex. jmeter.apache.org
or wildcard domain like *.apache.org. Use comma as separator. 
 proxy_domains_dynamic_mode_tooltip_java6=To activate this field, use a Java 7+ runtime environment
@@ -732,6 +738,8 @@ proxy_regex=Regex matching
 proxy_sampler_settings=HTTP Sampler settings
 proxy_sampler_type=Type\:
 proxy_separators=Add Separators
+proxy_settings_port_error_digits=Only digits allowed
+proxy_settings_port_error_invalid_data=Invalid data
 proxy_target=Target Controller\:
 proxy_test_plan_content=Test plan content
 proxy_title=HTTP(S) Test Script Recorder

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1531322&r1=1531321&r2=1531322&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Fri Oct 11 15:07:24
2013
@@ -716,6 +716,12 @@ proxy_content_type_filter=Filtre de type
 proxy_content_type_include=Inclure \:
 proxy_daemon_bind_error=Impossible de lancer le serveur proxy, le port est d\u00E9j\u00E0
utilis\u00E9. Choisissez un autre port.
 proxy_daemon_error=Impossible de lancer le serveur proxy, voir le journal pour plus de d\u00E9tails
+proxy_daemon_error_from_clipboard=depuis le presse-papier
+proxy_daemon_error_not_retrieve=Impossible d'ajouter
+proxy_daemon_error_read_args=Impossible de lire les arguments depuis le presse-papiers \:
+proxy_daemon_msg_check_details=Svp, v\u00E9rifier les d\u00E9tails ci-dessous lors de l'installation
du certificat dans le navigateur
+proxy_daemon_msg_created_in_bin=cr\u00E9\u00E9 dans le r\u00E9pertoire bin de JMeter
+proxy_daemon_msg_rootca_cert=Certificat AC ra\u00E7ine \:
 proxy_domains=Domaines HTTPS \:
 proxy_domains_dynamic_mode_tooltip=Liste de noms de domaine pour les url HTTPS, ex. jmeter.apache.org
ou les domaines wildcard comme *.apache.org. Utiliser la virgule comme s\u00E9parateur. 
 proxy_domains_dynamic_mode_tooltip_java6=Pour activer ce champ, utiliser un environnement
d'ex\u00E9cution Java 7+
@@ -725,6 +731,8 @@ proxy_regex=Correspondance des variables
 proxy_sampler_settings=Param\u00E8tres Echantillon HTTP
 proxy_sampler_type=Type \:
 proxy_separators=Ajouter des s\u00E9parateurs
+proxy_settings_port_error_digits=Seuls les chiffres sont autoris\u00E9s.
+proxy_settings_port_error_invalid_data=Donn\u00E9es invalides
 proxy_target=Contr\u00F4leur Cible \:
 proxy_test_plan_content=Param\u00E8tres du plan de test
 proxy_title=Serveur Proxy HTTP

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1531322&r1=1531321&r2=1531322&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Fri Oct 11 15:07:24 2013
@@ -84,6 +84,8 @@ public class ProxyControlGui extends Log
 
     private static final String NEW_LINE = "\n";  // $NON-NLS-1$
 
+    private static final String SPACE = " ";  // $NON-NLS-1$
+
     /**
      * This choice means don't explicitly set Implementation and rely on default, see Bug
54154
      */
@@ -416,7 +418,7 @@ public class ProxyControlGui extends Log
         GuiUtils.stopTableEditing(table);
         int rowCount = table.getRowCount();
         PowerTableModel model = null;
-        String[] exclusions = SUGGESTED_EXCLUSIONS.split(";");
+        String[] exclusions = SUGGESTED_EXCLUSIONS.split(";"); // $NON-NLS-1$
         if (exclusions.length>0) {
             model = (PowerTableModel) table.getModel();
             if(model != null) {
@@ -458,12 +460,16 @@ public class ProxyControlGui extends Log
             }
         } catch (IOException ioe) {
             JOptionPane.showMessageDialog(this,
-                    "Could not add read arguments from clipboard:\n" + ioe.getLocalizedMessage(),
"Error",
+                    JMeterUtils.getResString("proxy_daemon_error_read_args") // $NON-NLS-1$
+                    + "\n" + ioe.getLocalizedMessage(), JMeterUtils.getResString("error_title"),
 // $NON-NLS-1$  $NON-NLS-2$
                     JOptionPane.ERROR_MESSAGE);
         } catch (UnsupportedFlavorException ufe) {
             JOptionPane.showMessageDialog(this,
-                    "Could not add retrieve " + DataFlavor.stringFlavor.getHumanPresentableName()
-                            + " from clipboard" + ufe.getLocalizedMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+                    JMeterUtils.getResString("proxy_daemon_error_not_retrieve") + SPACE //
$NON-NLS-1$
+                        + DataFlavor.stringFlavor.getHumanPresentableName() + SPACE
+                        + JMeterUtils.getResString("proxy_daemon_error_from_clipboard") //
$NON-NLS-1$
+                        + ufe.getLocalizedMessage(), JMeterUtils.getResString("error_title"),
 // $NON-NLS-1$
+                        JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -483,30 +489,32 @@ public class ProxyControlGui extends Log
             if (ProxyControl.isDynamicMode()) {
                 String details[] = model.getCertificateDetails();
                 StringBuilder sb = new StringBuilder();
-                sb.append("Please check the details below when installing the certificate
in the browser")
+                sb.append(JMeterUtils.getResString("proxy_daemon_msg_check_details")) //
$NON-NLS-1$
                     .append(NEW_LINE).append(NEW_LINE);
                 for(String detail : details) {
                     sb.append(detail).append(NEW_LINE);
                 }
                 JOptionPane.showMessageDialog(this,
                     sb.toString(),
-                    "Root CA certificate: " + KeyToolUtils.ROOT_CACERT_CRT_PFX + " created
in JMeter bin directory",
+                    JMeterUtils.getResString("proxy_daemon_msg_rootca_cert") + SPACE // $NON-NLS-1$
+                    + KeyToolUtils.ROOT_CACERT_CRT_PFX + SPACE
+                    + JMeterUtils.getResString("proxy_daemon_msg_created_in_bin"), // $NON-NLS-1$
                     JOptionPane.INFORMATION_MESSAGE);
             }
         } catch (InvalidVariableException e) {
             JOptionPane.showMessageDialog(this,
                     JMeterUtils.getResString("invalid_variables"), // $NON-NLS-1$
-                    "Error",
+                    JMeterUtils.getResString("error_title"), // $NON-NLS-1$
                     JOptionPane.ERROR_MESSAGE);
         } catch (BindException e) {
             JOptionPane.showMessageDialog(this,
                     JMeterUtils.getResString("proxy_daemon_bind_error"), // $NON-NLS-1$
-                    "Error",
+                    JMeterUtils.getResString("error_title"), // $NON-NLS-1$
                     JOptionPane.ERROR_MESSAGE);
         } catch (IOException e) {
             JOptionPane.showMessageDialog(this,
                     JMeterUtils.getResString("proxy_daemon_error"), // $NON-NLS-1$
-                    "Error",
+                    JMeterUtils.getResString("error_title"), // $NON-NLS-1$
                     JOptionPane.ERROR_MESSAGE);
         } finally {
             setCursor(cursor);
@@ -541,7 +549,9 @@ public class ProxyControlGui extends Log
             } catch (NumberFormatException nfe) {
                 int length = portField.getText().length();
                 if (length > 0) {
-                    JOptionPane.showMessageDialog(this, "Only digits allowed", "Invalid data",
+                    JOptionPane.showMessageDialog(this, 
+                            JMeterUtils.getResString("proxy_settings_port_error_digits"),
// $NON-NLS-1$
+                            JMeterUtils.getResString("proxy_settings_port_error_invalid_data"),
// $NON-NLS-1$
                             JOptionPane.WARNING_MESSAGE);
                     // Drop the last character:
                     portField.setText(portField.getText().substring(0, length-1));



Mime
View raw message