@@ -103,7 +129,15 @@ export default {
{
text: this.$t("Matches.Owner"),
value: "owner"
- }
+ },
+ {
+ text: this.$t("Matches.Server"),
+ value: "ip_string"
+ },
+ {
+ //text: this.$t("Matches.ConnectButton"),
+ value: "connect"
+ }
];
},
isMyMatches() {
@@ -140,11 +174,11 @@ export default {
(match.cancelled == 0 || match.cancelled == null) &&
match.start_time != null
) {
- matchString = `Live, ${team1Score}:${team2Score} vs ${match.team2_string}`;
+ matchString = `Live, ${team1Score}:${team2Score} - ${match.team1_string} vs ${match.team2_string}`;
} else if (team1Score < team2Score) {
- matchString = `Lost, ${team1Score}:${team2Score} vs ${match.team2_string}`;
+ matchString = `Lost, ${team1Score}:${team2Score} - ${match.team1_string} vs ${match.team2_string}`;
} else if (team1Score > team2Score) {
- matchString = `Won, ${team1Score}:${team2Score} vs ${match.team2_string}`;
+ matchString = `Won, ${team1Score}:${team2Score} - ${match.team1_string} vs ${match.team2_string}`;
} else if (match.cancelled == 1) {
matchString = "Cancelled";
} else if (team1Score == team2Score && match.forfeit != 1) {
diff --git a/src/translations/translations.json b/src/translations/translations.json
index 7af2ba8..ad58a70 100644
--- a/src/translations/translations.json
+++ b/src/translations/translations.json
@@ -71,6 +71,7 @@
"StartTime": "Start:",
"EndTime": "End:",
"Connect": "Connect!",
+ "ConnectButtonAt": "Connecting to ",
"GOTVConnect": "Connect to GOTV!"
},
"CreateMatch": {
@@ -188,6 +189,8 @@
"Server": "Server",
"Owner": "Owner",
"DeleteButton": "Delete My Cancelled Matches",
+ "ConnectButton": "Connect",
+ "ConnectButtonAt": "Connecting to ",
"Versus": "vs"
},
"Metrics": {
@@ -418,9 +421,9 @@
"PauseMatch": "Mettre le match en pause",
"UnpauseMatch": "Reprendre le match",
"AddPlayerToServer": "Ajouter un joueur au serveur",
- "ListBackups": "Liste des sauvegarde",
+ "ListBackups": "Liste des sauvegardes",
"CancelMatch": "Annuler le match",
- "ForfeitMatch": "Forfeit Match",
+ "ForfeitMatch": "Déclarer forfait pour ce Match",
"Backup": "Sauvegarder",
"RCONCommand": "Commande RCON",
"RCONHint": "Travailler comme dans la console!",
@@ -437,7 +440,8 @@
"StartTime": "Début : ",
"EndTime": "Fin : ",
"Connect": "Connexion !",
- "GOTVConnect": "Connexion à la GOTV!"
+ "GOTVConnect": "Connexion à la GOTV!",
+ "ConnectButtonAt": "Se connecter à "
},
"CreateMatch": {
"FormServer": "Selectionner un serveur",
@@ -553,6 +557,8 @@
"Status": "Status",
"Server": "Serveur",
"Owner": "Propriétaire",
+ "ConnectButton": "Se connecter",
+ "ConnectButtonAt": "Se connecter au",
"DeleteButton": "Supprimer mes matchs annulés",
"Versus": "vs"
},
@@ -803,6 +809,8 @@
"StartTime": "スタート:",
"EndTime": "終り:",
"Connect": "つなげろ!",
+ "ConnectButton": "接続",
+ "ConnectButtonAt": "に接続する ",
"GOTVConnect": "GOTVに接続"
},
"CreateMatch": {
@@ -915,6 +923,8 @@
"Status": "状態",
"Server": "サーバ",
"Owner": "オーナー",
+ "ConnectButton": "接続",
+ "ConnectButtonAt": "に接続する ",
"DeleteButton": "キャンセルされたマッチを削除する",
"Versus": "対"
},
diff --git a/src/views/Season.vue b/src/views/Season.vue
index dc7bbf4..416e582 100644
--- a/src/views/Season.vue
+++ b/src/views/Season.vue
@@ -9,10 +9,10 @@
{{ seasonData.name }}
{{ isStarted }}:
- {{ new Date(seasonData.start_date).toLocaleDateString("en-CA") }}
+ {{ new Date(seasonData.start_date).toLocaleDateString() }}
{{ isEnding }}:
- {{ new Date(seasonData.end_date).toLocaleDateString("en-CA") }}
+ {{ new Date(seasonData.end_date).toLocaleDateString() }}
{{ seasonData.name }}