This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5e1b68c Align with master. i18n for AccessLog related messages
5e1b68c is described below
commit 5e1b68cac9d6ad953d97846b9af84eb6e372ab82
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 30 22:51:02 2019 +0100
Align with master. i18n for AccessLog related messages
---
.../catalina/valves/ExtendedAccessLogValve.java | 30 ++++++++++------------
.../apache/catalina/valves/LocalStrings.properties | 7 +++++
.../catalina/valves/LocalStrings_es.properties | 4 ++-
.../catalina/valves/LocalStrings_fr.properties | 22 ++++++++++++++++
.../catalina/valves/LocalStrings_ja.properties | 20 +++++++++++++++
5 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 43f5fa7..fab3dd6 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -544,7 +544,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
tokenizer.getWhiteSpaces();
if (tokenizer.isEnded()) {
- log.info("pattern was just empty or whitespace");
+ log.info(sm.getString("extendedAccessLogValve.emptyPattern"));
return null;
}
@@ -572,7 +572,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
}
return list.toArray(new AccessLogElement[0]);
} catch (IOException e) {
- log.error("parse error", e);
+ log.error(sm.getString("extendedAccessLogValve.patternParseError",
pattern), e);
return null;
}
}
@@ -630,7 +630,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
} else if ("x".equals(token)) {
return getXParameterElement(tokenizer);
}
- log.error("unable to decode with rest of chars starting: " + token);
+ log.error(sm.getString("extendedAccessLogValve.decodeError", token));
return null;
}
@@ -680,13 +680,12 @@ public class ExtendedAccessLogValve extends
AccessLogValve {
} else if (tokenizer.hasParameter()) {
String parameter = tokenizer.getParameter();
if (parameter == null) {
- log.error("No closing ) found for in decode");
+ log.error(sm.getString("extendedAccessLogValve.noClosing"));
return null;
}
return new RequestHeaderElement(parameter);
}
- log.error("The next characters couldn't be decoded: "
- + tokenizer.getRemains());
+ log.error(sm.getString("extendedAccessLogValve.decodeError",
tokenizer.getRemains()));
return null;
}
@@ -702,13 +701,12 @@ public class ExtendedAccessLogValve extends
AccessLogValve {
} else if (tokenizer.hasParameter()) {
String parameter = tokenizer.getParameter();
if (parameter == null) {
- log.error("No closing ) found for in decode");
+ log.error(sm.getString("extendedAccessLogValve.noClosing"));
return null;
}
return new ResponseHeaderElement(parameter);
}
- log.error("The next characters couldn't be decoded: "
- + tokenizer.getRemains());
+ log.error(sm.getString("extendedAccessLogValve.decodeError",
tokenizer.getRemains()));
return null;
}
@@ -722,14 +720,14 @@ public class ExtendedAccessLogValve extends
AccessLogValve {
tokenizer.getParameter();
return new StringElement("-");
}
- log.error("The next characters couldn't be decoded: " + token);
+ log.error(sm.getString("extendedAccessLogValve.decodeError", token));
return null;
}
protected AccessLogElement getXParameterElement(PatternTokenizer tokenizer)
throws IOException {
if (!tokenizer.hasSubToken()) {
- log.error("x param in wrong format. Needs to be 'x-#(...)' read
the docs!");
+ log.error(sm.getString("extendedAccessLogValve.badXParam"));
return null;
}
String token = tokenizer.getToken();
@@ -738,12 +736,12 @@ public class ExtendedAccessLogValve extends
AccessLogValve {
}
if (!tokenizer.hasParameter()) {
- log.error("x param in wrong format. Needs to be 'x-#(...)' read
the docs!");
+ log.error(sm.getString("extendedAccessLogValve.badXParam"));
return null;
}
String parameter = tokenizer.getParameter();
if (parameter == null) {
- log.error("No closing ) found for in decode");
+ log.error(sm.getString("extendedAccessLogValve.noClosing"));
return null;
}
if ("A".equals(token)) {
@@ -761,8 +759,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
} else if ("O".equals(token)) {
return new ResponseAllHeaderElement(parameter);
}
- log.error("x param for servlet request, couldn't decode value: "
- + token);
+ log.error(sm.getString("extendedAccessLogValve.badXParamValue",
token));
return null;
}
@@ -857,8 +854,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
}
};
}
- log.error("x param for servlet request, couldn't decode value: "
- + parameter);
+ log.error(sm.getString("extendedAccessLogValve.badXParamValue",
parameter));
return null;
}
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index f9f7646..07a7d68 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -40,6 +40,13 @@ errorReportValve.statusReport=Status Report
errorReportValve.type=Type
errorReportValve.unknownReason=Unknown Reason
+extendedAccessLogValve.badXParam=Invalid x parameter format, needs to be
'x-#(...)
+extendedAccessLogValve.badXParamValue=Invalid x parameter value for Servlet
request [{0}]
+extendedAccessLogValve.decodeError=Unable to decode the rest of chars starting
with [{0}]
+extendedAccessLogValve.emptyPattern=Pattern was just empty or whitespace
+extendedAccessLogValve.noClosing=No closing ) found for in decode
+extendedAccessLogValve.patternParseError=Error parsing pattern [{0}]
+
http.400.desc=The server cannot or will not process the request due to
something that is perceived to be a client error (e.g., malformed request
syntax, invalid request message framing, or deceptive request routing).
http.400.reason=Bad Request
http.401.desc=The request has not been applied because it lacks valid
authentication credentials for the target resource.
diff --git a/java/org/apache/catalina/valves/LocalStrings_es.properties
b/java/org/apache/catalina/valves/LocalStrings_es.properties
index d89b94e..701c3f4 100644
--- a/java/org/apache/catalina/valves/LocalStrings_es.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_es.properties
@@ -14,8 +14,10 @@
# limitations under the License.
accessLogValve.closeFail=No pude cerrar fichero de historial
+accessLogValve.invalidLocale=Fallo al fijar locales a [{0}]\n
accessLogValve.openDirFail=No pude crear directorio [{0}] para historiales de
acceso
-accessLogValve.rotateFail=No pude rotar historial de acceso
+accessLogValve.openFail=Fallo al abrir el archivo access log [{0}]\n
+accessLogValve.rotateFail=No se pudo rotar el historial de acceso
errorReportValve.description=descripción
errorReportValve.exception=excepción
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 3d93249..d6fa528 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -13,6 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+accessLogValve.alreadyExists=Échec de renommage du journal d''accès de [{0}]
en [{1}], le fichier existe déjà.
+accessLogValve.closeFail=Échec de fermeture du fichier de journal d'accès
+accessLogValve.deleteFail=Impossible d''effacer l''ancien journal d''accès
[{0}]
+accessLogValve.invalidLocale=Impossible de définir les paramètres régionaux
sur [{0}]
+accessLogValve.invalidPortType=Type de port [{0}] invalide, utilisation du
port (local) de serveur
+accessLogValve.openDirFail=Echec de création du répertoire [{0}] pour les
journaux d''accès
+accessLogValve.openFail=Echec à l''ouverture du journal d''accès [{0}]
+accessLogValve.renameFail=Échec de renommage du journal d''accès de [{0}] en
[{1}]
+accessLogValve.rotateFail=Échec de rotation des journaux d'accès
+accessLogValve.unsupportedEncoding=Impossible de changer l''encodage en [{0}],
le jeu de caractères par défaut du système sera utilisé
+accessLogValve.writeFail=Impossible d''écrire le message de log [{0}]
+
errorReportValve.description=description
errorReportValve.exception=exception
errorReportValve.exceptionReport=Rapport d''exception
@@ -24,6 +36,13 @@ errorReportValve.statusHeader=État HTTP {0} – {1}
errorReportValve.statusReport=Rapport d''état
errorReportValve.type=Type
+extendedAccessLogValve.badXParam=Le format du paramètre étendu est invalide,
il doit être de la forme 'x-#(...)'
+extendedAccessLogValve.badXParamValue=La valeur du paramètre étendu est
invalide pour la requête de Servlet [{0}]
+extendedAccessLogValve.decodeError=Impossible de décoder les caractères
restants à partir de [{0}]
+extendedAccessLogValve.emptyPattern=Le modèle est vide
+extendedAccessLogValve.noClosing=Une parenthèse de fermeture n'a pas été
trouvée lors du décodage
+extendedAccessLogValve.patternParseError=Erreur lors de l''analyse du modèle
[{0}]
+
http.400.desc=La requête envoyée par le client était syntaxiquement incorrecte.
http.401.desc=La requête nécessite une authentification HTTP.
http.402.desc=Un paiement est demandé pour accéder à cette ressource.
@@ -51,3 +70,6 @@ http.503.desc=Le service demandé n''est pas disponible
actuellement.
http.504.desc=Le serveur a reçu un dépassement de delai (timeout) d''un
serveur amont qu''il consultait en tant que relais ou passerelle.
http.505.desc=Le serveur ne supporte pas la version demandée du protocole HTTP.
http.507.desc=L''espace disponible est insuffisant pour enregistrer l''état de
la ressource après exécution de cette méthode.
+
+jdbcAccessLogValve.close=Echec de fermeture de la base de donnée
+jdbcAccessLogValve.exception=Exception en insérant l'entrée de l'accès
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties
b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 53bb647..086d2a6 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -13,6 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+accessLogValve.alreadyExists=[{0}]から[{1}]へのアクセスログの名前の変更に失敗しました。ファイルはすでに存在しています。
+accessLogValve.closeFail=アクセスログのクローズに失敗しました
+accessLogValve.deleteFail=古いアクセスログ[{0}]を削除できませんでした。
+accessLogValve.invalidLocale=[{0}] をロケールに設定できませんでした。
+accessLogValve.invalidPortType=不正なポート種類 [{0}] の代わりにサーバーのローカルポートを使用します。
+accessLogValve.openDirFail=アクセスログのディレクトリ[{0}]の作成に失敗しました
+accessLogValve.openFail=アクセスログファイル [{0}] を開けません。
+accessLogValve.renameFail=[{0}]から[{1}]へのアクセスログの名前の変更に失敗しました。
+accessLogValve.rotateFail=アクセスログのローテーションに失敗しました
+accessLogValve.unsupportedEncoding=文字エンコーディングに [{0}] を指定できません。システムの初期値を使用します。
+accessLogValve.writeFail=ログメッセージ[{0}]の書き込みに失敗しました
+
errorReportValve.description=説明
errorReportValve.exception=例外
errorReportValve.message=メッセージ
@@ -22,4 +34,12 @@ errorReportValve.rootCauseInLogs=原因のすべてのスタックトレース
errorReportValve.statusHeader=HTTPステータス {0} - {1}
errorReportValve.statusReport=ステータスレポート
+extendedAccessLogValve.badXParam=無効なxパラメータフォーマットです。 'x-#(...)にする必要があります。
+extendedAccessLogValve.badXParamValue=サーブレットリクエスト[{0}]の無効なxパラメータ値
+extendedAccessLogValve.decodeError=[{0}]で始まる残りの文字をデコードできません
+extendedAccessLogValve.emptyPattern=パターン文字列が空です。もしくは空白だけで構成されています。
+extendedAccessLogValve.noClosing=終了）がデコードで見つかりません。
+extendedAccessLogValve.patternParseError=パターン文字列 [{0}] を解釈できませんでした。
+
+jdbcAccessLogValve.close=データベースのクローズに失敗しました。
jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
