diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-07-23 17:18:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 17:18:33 +0200 |
| commit | 6ff51b3dff6b9e22b4c0ac02b8b2c4372c24c002 (patch) | |
| tree | 379069772d6306b9085883e48c87d14ff52986d0 /security/manager | |
| parent | 72e628874a7b96d33fa550626be56e334dda50c8 (diff) | |
| parent | e313e5e2ec19355988c3d59745c202f4604670d3 (diff) | |
| download | UXP-6ff51b3dff6b9e22b4c0ac02b8b2c4372c24c002.tar UXP-6ff51b3dff6b9e22b4c0ac02b8b2c4372c24c002.tar.gz UXP-6ff51b3dff6b9e22b4c0ac02b8b2c4372c24c002.tar.lz UXP-6ff51b3dff6b9e22b4c0ac02b8b2c4372c24c002.tar.xz UXP-6ff51b3dff6b9e22b4c0ac02b8b2c4372c24c002.zip | |
Merge pull request #666 from kn-yami/issue605
replace "certErrorCodePrefix2" with "certErrorCodePrefix"
Diffstat (limited to 'security/manager')
| -rwxr-xr-x | security/manager/locales/en-US/chrome/pipnss/pipnss.properties | 3 | ||||
| -rw-r--r-- | security/manager/ssl/TransportSecurityInfo.cpp | 2 | ||||
| -rw-r--r-- | security/manager/ssl/nsNSSErrors.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties b/security/manager/locales/en-US/chrome/pipnss/pipnss.properties index 9c732ce9d..23d7a323c 100755 --- a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties +++ b/security/manager/locales/en-US/chrome/pipnss/pipnss.properties @@ -279,8 +279,7 @@ certErrorExpiredNow=The certificate expired on %1$S. The current time is %2$S. # LOCALIZATION NOTE (certErrorNotYetValidNow): Do not translate %1$S (date+time certificate will become valid) or %2$S (current date+time) certErrorNotYetValidNow=The certificate will not be valid until %1$S. The current time is %2$S. -# LOCALIZATION NOTE (certErrorCodePrefix2): Do not translate <a id="errorCode" title="%1$S">%1$S</a> -certErrorCodePrefix2=Error code: <a id="errorCode" title="%1$S">%1$S</a> +certErrorCodePrefix=(Error code: %S) P12DefaultNickname=Imported Certificate CertUnknown=Unknown diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp index fe39f4017..0e2238ad0 100644 --- a/security/manager/ssl/TransportSecurityInfo.cpp +++ b/security/manager/ssl/TransportSecurityInfo.cpp @@ -854,7 +854,7 @@ AppendErrorTextCode(PRErrorCode errorCodeToReport, nsString formattedString; nsresult rv; - rv = component->PIPBundleFormatStringFromName("certErrorCodePrefix2", + rv = component->PIPBundleFormatStringFromName("certErrorCodePrefix", params, 1, formattedString); if (NS_SUCCEEDED(rv)) { diff --git a/security/manager/ssl/nsNSSErrors.cpp b/security/manager/ssl/nsNSSErrors.cpp index fc8bd3e31..1613eb4e7 100644 --- a/security/manager/ssl/nsNSSErrors.cpp +++ b/security/manager/ssl/nsNSSErrors.cpp @@ -84,7 +84,7 @@ nsNSSErrors::getErrorMessageFromCode(PRErrorCode err, params[0] = idU.get(); nsString formattedString; - rv = component->PIPBundleFormatStringFromName("certErrorCodePrefix2", + rv = component->PIPBundleFormatStringFromName("certErrorCodePrefix", params, 1, formattedString); if (NS_SUCCEEDED(rv)) { |