Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
371acb9b
Commit
371acb9b
authored
Jun 22, 2022
by
AnimeGitB
Browse files
Deduplicate some translation keys
parent
dcd3c696
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/command/CommandMap.java
View file @
371acb9b
...
@@ -156,7 +156,7 @@ public final class CommandMap {
...
@@ -156,7 +156,7 @@ public final class CommandMap {
CommandHandler
.
sendTranslatedMessage
(
player
,
targetPlayer
.
isOnline
()?
"commands.execution.set_target_online"
:
"commands.execution.set_target_offline"
,
targetUidStr
);
CommandHandler
.
sendTranslatedMessage
(
player
,
targetPlayer
.
isOnline
()?
"commands.execution.set_target_online"
:
"commands.execution.set_target_offline"
,
targetUidStr
);
}
}
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.
execution.uid_error
"
);
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.
generic.invalid.uid
"
);
}
}
}
}
return
;
return
;
...
@@ -183,7 +183,7 @@ public final class CommandMap {
...
@@ -183,7 +183,7 @@ public final class CommandMap {
}
}
break
;
break
;
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.
execution.uid_error
"
);
CommandHandler
.
sendTranslatedMessage
(
player
,
"commands.
generic.invalid.uid
"
);
return
;
return
;
}
}
}
}
...
...
src/main/java/emu/grasscutter/command/commands/CoopCommand.java
View file @
371acb9b
...
@@ -31,7 +31,7 @@ public final class CoopCommand implements CommandHandler {
...
@@ -31,7 +31,7 @@ public final class CoopCommand implements CommandHandler {
}
}
break
;
break
;
}
catch
(
NumberFormatException
ignored
)
{
}
catch
(
NumberFormatException
ignored
)
{
CommandHandler
.
sendMessage
(
sender
,
translate
(
sender
,
"commands.
execution.uid_error
"
));
CommandHandler
.
sendMessage
(
sender
,
translate
(
sender
,
"commands.
generic.invalid.uid
"
));
return
;
return
;
}
}
default
:
default
:
...
...
src/main/resources/languages/en-US.json
View file @
371acb9b
...
@@ -81,12 +81,9 @@
...
@@ -81,12 +81,9 @@
}
}
},
},
"execution"
:
{
"execution"
:
{
"uid_error"
:
"Invalid UID."
,
"player_exist_error"
:
"Player not found."
,
"player_exist_error"
:
"Player not found."
,
"player_offline_error"
:
"Player is not online."
,
"player_offline_error"
:
"Player is not online."
,
"item_id_error"
:
"Invalid item ID."
,
"item_player_exist_error"
:
"Invalid item or UID."
,
"item_player_exist_error"
:
"Invalid item or UID."
,
"entity_id_error"
:
"Invalid entity ID."
,
"player_exist_offline_error"
:
"Player not found or is not online."
,
"player_exist_offline_error"
:
"Player not found or is not online."
,
"argument_error"
:
"Invalid arguments."
,
"argument_error"
:
"Invalid arguments."
,
"clear_target"
:
"Target cleared."
,
"clear_target"
:
"Target cleared."
,
...
...
src/main/resources/languages/fr-FR.json
View file @
371acb9b
...
@@ -81,12 +81,9 @@
...
@@ -81,12 +81,9 @@
}
}
},
},
"execution"
:
{
"execution"
:
{
"uid_error"
:
"UID invalide."
,
"player_exist_error"
:
"Joueur introuvable."
,
"player_exist_error"
:
"Joueur introuvable."
,
"player_offline_error"
:
"Le joueur n'est pas connecté."
,
"player_offline_error"
:
"Le joueur n'est pas connecté."
,
"item_id_error"
:
"ID de l'objet invalide."
,
"item_player_exist_error"
:
"UID ou objet invalide."
,
"item_player_exist_error"
:
"UID ou objet invalide."
,
"entity_id_error"
:
"ID de l'entité invalide."
,
"player_exist_offline_error"
:
"Le joueur est introuvable ou n'est pas connecté."
,
"player_exist_offline_error"
:
"Le joueur est introuvable ou n'est pas connecté."
,
"argument_error"
:
"Arguments invalides."
,
"argument_error"
:
"Arguments invalides."
,
"clear_target"
:
"Cible réinitialisée."
,
"clear_target"
:
"Cible réinitialisée."
,
...
...
src/main/resources/languages/pl-PL.json
View file @
371acb9b
...
@@ -75,12 +75,9 @@
...
@@ -75,12 +75,9 @@
}
}
},
},
"execution"
:
{
"execution"
:
{
"uid_error"
:
"Błędne UID."
,
"player_exist_error"
:
"Gracz nie znaleziony."
,
"player_exist_error"
:
"Gracz nie znaleziony."
,
"player_offline_error"
:
"Gracz nie jest online."
,
"player_offline_error"
:
"Gracz nie jest online."
,
"item_id_error"
:
"Błędne ID przedmiotu."
,
"item_player_exist_error"
:
"Błędny przedmiot lub UID."
,
"item_player_exist_error"
:
"Błędny przedmiot lub UID."
,
"entity_id_error"
:
"Błędne ID obiektu."
,
"player_exist_offline_error"
:
"Gracz nie znaleziony lub jest offline."
,
"player_exist_offline_error"
:
"Gracz nie znaleziony lub jest offline."
,
"argument_error"
:
"Błędne argumenty."
,
"argument_error"
:
"Błędne argumenty."
,
"clear_target"
:
"Cel wyczyszczony."
,
"clear_target"
:
"Cel wyczyszczony."
,
...
...
src/main/resources/languages/ru-RU.json
View file @
371acb9b
...
@@ -81,12 +81,9 @@
...
@@ -81,12 +81,9 @@
}
}
},
},
"execution"
:
{
"execution"
:
{
"uid_error"
:
"Некорректный UID."
,
"player_exist_error"
:
"Игрок не найден."
,
"player_exist_error"
:
"Игрок не найден."
,
"player_offline_error"
:
"Игрок не в сети."
,
"player_offline_error"
:
"Игрок не в сети."
,
"item_id_error"
:
"Некорректный ID предмета."
,
"item_player_exist_error"
:
"Некорректный предмет или UID."
,
"item_player_exist_error"
:
"Некорректный предмет или UID."
,
"entity_id_error"
:
"Некорректный ID сущности."
,
"player_exist_offline_error"
:
"Игрок не был найден или не в сети."
,
"player_exist_offline_error"
:
"Игрок не был найден или не в сети."
,
"argument_error"
:
"Некорректные аргументы."
,
"argument_error"
:
"Некорректные аргументы."
,
"clear_target"
:
"Цель была удалена."
,
"clear_target"
:
"Цель была удалена."
,
...
...
src/main/resources/languages/zh-CN.json
View file @
371acb9b
...
@@ -81,12 +81,9 @@
...
@@ -81,12 +81,9 @@
}
}
},
},
"execution"
:
{
"execution"
:
{
"uid_error"
:
"无效的UID。"
,
"player_exist_error"
:
"玩家不存在。"
,
"player_exist_error"
:
"玩家不存在。"
,
"player_offline_error"
:
"玩家已离线。"
,
"player_offline_error"
:
"玩家已离线。"
,
"item_id_error"
:
"无效的物品ID。"
,
"item_player_exist_error"
:
"无效的物品/玩家UID。"
,
"item_player_exist_error"
:
"无效的物品/玩家UID。"
,
"entity_id_error"
:
"无效的实体ID。"
,
"player_exist_offline_error"
:
"玩家不存在或已离线。"
,
"player_exist_offline_error"
:
"玩家不存在或已离线。"
,
"argument_error"
:
"无效的参数。"
,
"argument_error"
:
"无效的参数。"
,
"clear_target"
:
"目标已清除。"
,
"clear_target"
:
"目标已清除。"
,
...
...
src/main/resources/languages/zh-TW.json
View file @
371acb9b
...
@@ -80,12 +80,9 @@
...
@@ -80,12 +80,9 @@
}
}
},
},
"execution"
:
{
"execution"
:
{
"uid_error"
:
"無效的UID。"
,
"player_exist_error"
:
"用戶不存在。"
,
"player_exist_error"
:
"用戶不存在。"
,
"player_offline_error"
:
"玩家已離線。"
,
"player_offline_error"
:
"玩家已離線。"
,
"item_id_error"
:
"無效的物品ID。."
,
"item_player_exist_error"
:
"無效的物品/玩家UID。"
,
"item_player_exist_error"
:
"無效的物品/玩家UID。"
,
"entity_id_error"
:
"無效的實體ID。"
,
"player_exist_offline_error"
:
"玩家不存在或已離線。"
,
"player_exist_offline_error"
:
"玩家不存在或已離線。"
,
"argument_error"
:
"無效的參數。"
,
"argument_error"
:
"無效的參數。"
,
"clear_target"
:
"目標已清除."
,
"clear_target"
:
"目標已清除."
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment