jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1839890 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/action/SSLManagerCommand.java resources/messages.properties resources/messages_fr.properties
Date Sun, 02 Sep 2018 19:47:25 GMT
Author: pmouawad
Date: Sun Sep  2 19:47:25 2018
New Revision: 1839890

URL: http://svn.apache.org/viewvc?rev=1839890&view=rev
Log:
Improve dialog title
Indicate that we accept pfx

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?rev=1839890&r1=1839889&r2=1839890&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java Sun Sep  2 19:47:25
2018
@@ -88,6 +88,7 @@ public class SSLManagerCommand extends A
         SSLManager.reset();
 
         JFileChooser keyStoreChooser = new JFileChooser(System.getProperty("user.dir"));
//$NON-NLS-1$
+        keyStoreChooser.setDialogTitle(JMeterUtils.getResString("sslmanager.title"));
         keyStoreChooser.addChoosableFileFilter(new AcceptPKCS12OrJKSFileFilter());
         keyStoreChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         int retVal = keyStoreChooser.showOpenDialog(GuiPackage.getInstance().getMainFrame());
@@ -130,7 +131,8 @@ public class SSLManagerCommand extends A
             String lowerCaseName = testFile.getName().toLowerCase();
             return testFile.isDirectory()
             || lowerCaseName.endsWith(".p12")  //$NON-NLS-1$
-            || lowerCaseName.endsWith(".jks");
+            || lowerCaseName.endsWith(".jks")
+            || lowerCaseName.endsWith(".pfx");
         }
     }
 }

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=1839890&r1=1839889&r2=1839890&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Sep  2 19:47:25
2018
@@ -760,7 +760,7 @@ path_extension_dont_use_equals=Do not us
 path_extension_dont_use_questionmark=Do not use questionmark in path extension (Intershop
Enfinity compatibility)
 patterns_to_exclude=URL Patterns to Exclude
 patterns_to_include=URL Patterns to Include
-keystore_desc=Keystore Files (*.p12, *.jks)
+keystore_desc=Keystore Files (*.p12, *.pfx, *.jks)
 pl=Polish
 poisson_timer_delay=Constant Delay Offset (in milliseconds)\:
 poisson_timer_memo=Adds a random delay with a Poisson distribution
@@ -1160,6 +1160,7 @@ ssl_pass_prompt=Please type your passwor
 ssl_pass_title=KeyStore Password
 ssl_port=SSL Port
 sslmanager=SSL Manager
+sslmanager.title=Select client certificate file
 start=Start
 start_no_timers=Start no pauses
 start_value=Starting value

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=1839890&r1=1839889&r2=1839890&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 Sun Sep  2 19:47:25
2018
@@ -749,7 +749,7 @@ path_extension_dont_use_equals=Ne pas ut
 path_extension_dont_use_questionmark=Ne pas utiliser le point d'interrogation dans l'extension
du chemin (Compatiblit\u00E9 Intershop Enfinity)
 patterns_to_exclude=URL \: motifs \u00E0 exclure
 patterns_to_include=URL \: motifs \u00E0 inclure
-keystore_desc=Fichiers keystore (*.p12, *.jks)
+keystore_desc=Fichiers keystore (*.p12, *.pfx, *.jks)
 pl=Polonais
 poisson_timer_delay=D\u00E9lai de d\u00E9calage bas\u00E9 sur la loi de Poisson (en millisecondes)
\:
 poisson_timer_memo=Ajoute un d\u00E9lai al\u00E9atoire avec une distribution de type Poisson
@@ -1149,6 +1149,7 @@ ssl_pass_prompt=Entrer votre mot de pass
 ssl_pass_title=Mot de passe KeyStore
 ssl_port=Port SSL
 sslmanager=Gestionnaire SSL
+sslmanager.title=S\u00e9lectionner le fichier de certificat client
 start=Lancer
 start_no_timers=Lancer sans pauses
 start_value=Valeur initiale \:



Mime
View raw message