This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d8f5ca6d72e8d3a9925df0fc60745347cb4795fa
Author: Fabien Zindy <fabien.zi...@gmail.com>
AuthorDate: Thu Jul 2 00:34:36 2020 +0200
Remove `hostManagerServlet.listitem` from the localized strings
---
java/org/apache/catalina/manager/host/HostManagerServlet.java | 3 +--
java/org/apache/catalina/manager/host/LocalStrings.properties | 1 -
java/org/apache/catalina/manager/host/LocalStrings_es.properties | 1 -
java/org/apache/catalina/manager/host/LocalStrings_fr.properties | 1 -
java/org/apache/catalina/manager/host/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/manager/host/LocalStrings_ko.properties | 1 -
java/org/apache/catalina/manager/host/LocalStrings_ru.properties | 1 -
java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties | 1 -
8 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index b18f413..4d548c6 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -523,8 +523,7 @@ public class HostManagerServlet
Host host = (Host) container;
String name = host.getName();
String[] aliases = host.findAliases();
- writer.println(smClient.getString("hostManagerServlet.listitem",
- name, StringUtils.join(aliases)));
+ writer.println(String.format("[%s]:[%s]", name,
StringUtils.join(aliases)));
}
}
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties
b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 60dbb67..5e549f3 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL - Encountered exception
[{0}]
hostManagerServlet.invalidHostName=FAIL - Invalid host name [{0}] was specified
hostManagerServlet.list=list: Listing hosts for engine [{0}]
hostManagerServlet.listed=OK - Listed hosts
-hostManagerServlet.listitem=[{0}]:[{1}]
hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
hostManagerServlet.noCommand=FAIL - No command was specified
hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_es.properties
b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
index d53a50c..732a0f4 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FALLO - Encontrada excepción
[{0}]
hostManagerServlet.invalidHostName=FALLO - Se ha especificado un nombre
inválido de máquina [{0}]
hostManagerServlet.list=listar: Listando máquinas para motor [{0}]
hostManagerServlet.listed=OK - Máquinas listadas
-hostManagerServlet.listitem=[{0}]:[{1}]
hostManagerServlet.managerXml=FALLO - no pude instalar manager.xml
hostManagerServlet.noCommand=FALLO - No se ha especificado comando
hostManagerServlet.noHost=FALLO - El nombre de máquina [{0}] no existe
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
index e12aedd..ad93dfc 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=ECHEC - Exception [{0}]
hostManagerServlet.invalidHostName=ECHEC - Un nom d''hôte [{0}] invalide a été
spécifié
hostManagerServlet.list=list : Liste des hôte pour le moteur [{0}]
hostManagerServlet.listed=OK - Liste des hôtes
-hostManagerServlet.listitem=[{0}] : [{1}]
hostManagerServlet.managerXml=ECHEC - "manager.xml" n'a pas pu être installé
hostManagerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
hostManagerServlet.noHost=ECHEC - Le nom d''hôte [{0}] n''existe pas
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
index 4eb6414..8bf88a8 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL - 例外[{0}]が発生しました
hostManagerServlet.invalidHostName=FAIL - 無効なホスト名[{0}]が指定されました
hostManagerServlet.list=リスト：Engine[{0}]のHostのリスト
hostManagerServlet.listed=OK - 列挙されたHost
-hostManagerServlet.listitem=[{0}]:[{1}]
hostManagerServlet.managerXml=FAIL - manager.xml をインストールできませんでした。
hostManagerServlet.noCommand=FAIL - コマンドが指定されませんでした。
hostManagerServlet.noHost=FAIL - ホスト名 [{0}] は存在しません。
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
b/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
index 70a627f..8ce25c0 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=실패 - 예외 발생 [{0}]
hostManagerServlet.invalidHostName=실패 - 유효하지 않은 호스트 이름 [{0}]이(가) 지정되었습니다.
hostManagerServlet.list=목록: 엔진 [{0}]을(를) 위한 호스트들의 목록을 표시합니다.
hostManagerServlet.listed=OK - 호스트 목록
-hostManagerServlet.listitem=[{0}]:[{1}]
hostManagerServlet.managerXml=실패 - manager.xml을 설치할 수 없었습니다.
hostManagerServlet.noCommand=실패 - 명령이 지정되지 않았습니다.
hostManagerServlet.noHost=실패 - 호스트 이름 [{0}]은(는) 존재하지 않습니다.
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
index 13d97fe..c50b342 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=Ошибка - Необычная ситуация
hostManagerServlet.invalidHostName=Ошибка - Указано недопустимое имя сервера
[{0}]
hostManagerServlet.list=list: Список серверов для движка [{0}]
hostManagerServlet.listed=OK - Список серверов
-hostManagerServlet.listitem=[{0}]:[{1}]
hostManagerServlet.managerXml=Ошибка - Не удалось создать файл manager.xml
hostManagerServlet.noCommand=Ошибка - Команда не указана.
hostManagerServlet.noHost=Ошибка - Сервер с указанным именем [{0}] не
существует
diff --git
a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
index b68c873..37cd365 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=失败 - 出现异常[{0}]
hostManagerServlet.invalidHostName=失败 - 指定的主机名称[{0}]无效
hostManagerServlet.list=列表：列出引擎[{0}]的主机
hostManagerServlet.listed=OK - 已列出Host
-hostManagerServlet.listitem=[{0}]:[{1}]
hostManagerServlet.managerXml=FAIL - 无法安装manager.xml
hostManagerServlet.noCommand=失败 - 未指定命令
hostManagerServlet.noHost=失败 - 主机名称[{0}]不存在
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
