From 3e65c84e4f299a6ab684f8f0dd613b514b127f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C5=A0ulik?= <24414775+sulikdan@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:10:24 +0200 Subject: [PATCH] Feature/mods more info moved 2 top (#3241) * Moved more detail to the top header, removed progress bar, as it was not used + some translation modified, but especially turkish and asian version should be checked. * Removing progress-bar emmbers --- .../client/mod/ModDetailController.java | 30 ++-- src/main/resources/i18n/messages.properties | 9 +- .../resources/i18n/messages_cat.properties | 8 +- .../resources/i18n/messages_cs.properties | 8 +- .../resources/i18n/messages_de.properties | 8 +- .../resources/i18n/messages_es.properties | 8 +- .../resources/i18n/messages_fr.properties | 8 +- .../resources/i18n/messages_it.properties | 8 +- .../resources/i18n/messages_ko.properties | 6 +- .../resources/i18n/messages_nl.properties | 8 +- .../resources/i18n/messages_pl.properties | 8 +- .../resources/i18n/messages_ru.properties | 8 +- .../resources/i18n/messages_tr.properties | 8 +- .../resources/i18n/messages_uk.properties | 8 +- .../resources/i18n/messages_zh.properties | 8 +- .../resources/i18n/messages_zh_TW.properties | 6 +- .../resources/theme/vault/mod/mod_detail.fxml | 133 +++++++++++------- 17 files changed, 152 insertions(+), 128 deletions(-) diff --git a/src/main/java/com/faforever/client/mod/ModDetailController.java b/src/main/java/com/faforever/client/mod/ModDetailController.java index 804b765081..a376cb6525 100644 --- a/src/main/java/com/faforever/client/mod/ModDetailController.java +++ b/src/main/java/com/faforever/client/mod/ModDetailController.java @@ -30,7 +30,6 @@ import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.Label; -import javafx.scene.control.ProgressBar; import javafx.scene.control.ScrollPane; import javafx.scene.image.ImageView; import javafx.scene.input.KeyCode; @@ -43,6 +42,9 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; +import java.util.Arrays; +import java.util.stream.Collectors; + @Component @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @Slf4j @@ -68,7 +70,6 @@ public class ModDetailController extends NodeController { public Label versionLabel; public Label dependenciesTitle; public VBox dependenciesContainer; - public Label progressLabel; public ScrollPane scrollPane; public Button uninstallButton; public Button installButton; @@ -76,7 +77,6 @@ public class ModDetailController extends NodeController { public Label nameLabel; public Label idLabel; public Label uploaderLabel; - public ProgressBar progressBar; public Label modDescriptionLabel; public Node modDetailRoot; public ReviewsController reviewsController; @@ -84,7 +84,7 @@ public class ModDetailController extends NodeController { @Override protected void onInitialize() { - JavaFxUtil.bindManagedToVisible(uninstallButton, installButton, progressBar, progressLabel, getRoot()); + JavaFxUtil.bindManagedToVisible(uninstallButton, installButton, getRoot()); JavaFxUtil.fixScrollSpeed(scrollPane); contextMenuBuilder.addCopyLabelContextMenu(nameLabel, authorLabel, idLabel, uploaderLabel, versionLabel); @@ -110,13 +110,16 @@ private void bindProperties() { .flatMap(imageViewHelper::createPlaceholderImageOnErrorObservable) .when(showing)); nameLabel.textProperty().bind(modObservable.map(Mod::displayName).when(showing)); - authorLabel.textProperty().bind(modObservable.map(Mod::author) - .map(author -> i18n.get("modVault.details.author", author)) - .when(showing)); + authorLabel.textProperty() + .bind(modObservable.map(Mod::author) + .map(author -> Arrays.stream(author.split(",")) + .map(String::trim) + .collect(Collectors.joining("\n"))) + .when(showing)); uploaderLabel.textProperty().bind(modObservable.map(Mod::uploader).flatMap(PlayerInfo::usernameProperty) - .map(author -> i18n.get("modVault.details.uploader", author)) + .map(author -> author) .when(showing)); - idLabel.textProperty().bind(modVersion.map(ModVersion::id).map(id -> i18n.get("mod.idNumber", id)).when(showing)); + idLabel.textProperty().bind(modVersion.map(ModVersion::id).map(Object::toString).when(showing)); updatedLabel.textProperty().bind(modVersion.map(ModVersion::createTime).map(timeService::asDate).when(showing)); @@ -131,9 +134,6 @@ private void bindProperties() { BooleanExpression installed = modService.isInstalledBinding(modVersion); installButton.visibleProperty().bind(installed.not().when(showing)); uninstallButton.visibleProperty().bind(installed.when(showing)); - progressBar.visibleProperty() - .bind(uninstallButton.visibleProperty().not().and(installButton.visibleProperty().not()).when(showing)); - progressLabel.visibleProperty().bind(progressBar.visibleProperty().when(showing)); } public void onCloseButtonClicked() { @@ -216,8 +216,7 @@ void onSendReview(ModVersionReview review) { public void onInstallButtonClicked() { ModVersion modVersion = this.modVersion.get(); - modService.downloadIfNecessary(modVersion, progressBar.progressProperty(), - progressLabel.textProperty()).subscribe(null, throwable -> { + modService.downloadIfNecessary(modVersion, null, null).subscribe(null, throwable -> { log.error("Could not install mod", throwable); notificationService.addImmediateErrorNotification(throwable, "modVault.installationFailed", modVersion.mod().displayName(), @@ -226,9 +225,6 @@ public void onInstallButtonClicked() { } public void onUninstallButtonClicked() { - progressBar.progressProperty().unbind(); - progressBar.setProgress(-1); - ModVersion modVersion = this.modVersion.get(); modService.uninstallMod(modVersion) .exceptionally(throwable -> { diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index 9b217afa3d..c3d1e31c07 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -758,8 +758,9 @@ settings.account.goWebsite = For account related activities you need to visit ou settings.account.goWebsiteButton = Visit the FAForever Website map.versionId = Map version ID vault.replays.ownReplays = Your replays -modVault.details.uploader = Uploaded by\: {0} -modVault.details.author = Authored by\: {0} +modVault.details.uploader = Uploaded by +modVault.details.author = Authored by +modVault.details.description = Description gameSelect.select.invalidPath = Invalid path gamePath.select.noneChosen = You did not select a game location\! gamePath.select.noValidExe = The specified location does not contain a valid Supreme Commander.exe and is therefore is no valid Forged Alliance installation. @@ -921,7 +922,7 @@ settings.chat.dateFormat = Date Format settings.chat.dateFormat.description = In which format the date should be displayed in the chat. chat.error.noHashTag = Channel Name must start with \# (Try \#{0}) game.gameStatus.hosting = Hosting -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = copy settings.fa.allowReplayWhileInGame = Allow watching replays while in game settings.fa.patchGamePrefs = Patch Game.prefs @@ -1302,4 +1303,4 @@ teammatchmaking.searchButton.inGame = Can't join matchmaking while you are in a teammatchmaking.searchButton.memberInGame = Can't join matchmaking while someone is in a game teammatchmaking.searchButton.inParty = The party leader will start matchmaking teammatchmaking.searchButton.inQueue = Your party is now searching for a game -leaderboard.tmm_3v3.name = 3v3 \ No newline at end of file +leaderboard.tmm_3v3.name = 3v3 diff --git a/src/main/resources/i18n/messages_cat.properties b/src/main/resources/i18n/messages_cat.properties index 81864701b7..1a69ec6a46 100644 --- a/src/main/resources/i18n/messages_cat.properties +++ b/src/main/resources/i18n/messages_cat.properties @@ -765,8 +765,8 @@ settings.account.goWebsite = Per a la majoria d'activitats relacionades amb el c settings.account.goWebsiteButton = Visita la pàgina web de FAForever map.versionId = ID de versió de mapa vault.replays.ownReplays = Les teves repeticions -modVault.details.uploader = Pujat per\: {0} -modVault.details.author = Signat per\: {0} +modVault.details.uploader = Pujat per\: +modVault.details.author = Signat per\: gameSelect.select.invalidPath = Ruta invàlida gamePath.select.noneChosen = No has triat una localització de partida\! gamePath.select.noValidExe = La localització especificada no conté un Supreme Commander.exe vàlid i per tant no és una instal·lació vàlida de Forged Alliance. @@ -929,7 +929,7 @@ settings.chat.dateFormat = Format de Data settings.chat.dateFormat.description = En quin format hauria de representar-se la data al xat. chat.error.noHashTag = El Nom del Canal ha de començar amb \# (Prova \#{0}) game.gameStatus.hosting = Hostatjar -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = copia settings.fa.allowReplayWhileInGame = Permet observar repeticions durant la partida # Should this be translated or is it part of the code? @@ -1269,4 +1269,4 @@ settings.fa.iceDebugWindow = Mostra la finestra de debug de l'adaptador ICE settings.fa.iceDebugWindow.description = Mostra una finestra amb detalls de connexió sobre altres jugadors connectats. chat.userContext.addNote = Afegeix nota chat.userContext.editNote = Edita la nota -chat.userContext.removeNote = Esborrar nota \ No newline at end of file +chat.userContext.removeNote = Esborrar nota diff --git a/src/main/resources/i18n/messages_cs.properties b/src/main/resources/i18n/messages_cs.properties index 477b1ff104..d3dbfa3530 100644 --- a/src/main/resources/i18n/messages_cs.properties +++ b/src/main/resources/i18n/messages_cs.properties @@ -781,8 +781,8 @@ settings.account.goWebsite = Pro aktivity související s účtem musíte navšt settings.account.goWebsiteButton = Navštivte webovou stránku FAForever map.versionId = ID verze mapy vault.replays.ownReplays = Tvoje nahrávky -modVault.details.uploader = Nahrál\: {0} -modVault.details.author = Autor\: {0} +modVault.details.uploader = Nahrál\: +modVault.details.author = Autor\: gameSelect.select.invalidPath = Neplatná cesta gamePath.select.noneChosen = Nezvolili jste umístění hry\! gamePath.select.noValidExe = Zadané umístění neobsahuje platný Supreme Commander.exe, a proto není platný na instalaci Forged Alliance. @@ -942,7 +942,7 @@ settings.chat.dateFormat = Datum Formát settings.chat.dateFormat.description = V jakém formátu se má datum zobrazovat v chatu. chat.error.noHashTag = Název kanálu musí začínat \# (Try \#{0}) game.gameStatus.hosting = Hostování -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = kopírovat settings.fa.allowReplayWhileInGame = Povolit sledování záznamú během hry settings.fa.patchGamePrefs = Oprava Game.prefs @@ -1320,4 +1320,4 @@ blacklist.mapFolderName.promptText = Úplný nebo částečný název složky ma hideSingleGames = Skrýt hry s 1 hráčem showGamesWithFriends = Zobrazit pouze hry s přáteli showGeneratedMaps = Zobrazit pouze vygenerované mapy -games.couldNotStart = Hru nelze spustit. Viz chybovou zprávu níže. \ No newline at end of file +games.couldNotStart = Hru nelze spustit. Viz chybovou zprávu níže. diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties index bc3456bb56..12b1ac368a 100644 --- a/src/main/resources/i18n/messages_de.properties +++ b/src/main/resources/i18n/messages_de.properties @@ -765,8 +765,8 @@ settings.account.goWebsite = Für administrative Tätigkeiten bezüglich deines settings.account.goWebsiteButton = Gehe zur FAForever Website map.versionId = Kartenversions ID vault.replays.ownReplays = Deine Replays -modVault.details.uploader = Hochgeladen von\: {0} -modVault.details.author = Author\: {0} +modVault.details.uploader = Hochgeladen von\: +modVault.details.author = Author\: gameSelect.select.invalidPath = Invalider Pfad gamePath.select.noneChosen = Du hast den Ort deines Spiels nicht angegeben\! gamePath.select.noValidExe = Der angegebene Speicherort enthält keine gültige Supreme Commander.exe und ist daher keine gültige Forged Alliance-Installation. @@ -926,7 +926,7 @@ settings.chat.dateFormat = Datumsformat settings.chat.dateFormat.description = In welchem Format das Datum im Chat angezeigt werden soll. chat.error.noHashTag = Der Channelname muss mit \# beginnen (Probiere \#{0}) game.gameStatus.hosting = Am hosten -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = Kopieren settings.fa.allowReplayWhileInGame = Erlaube das Ansehen von Replays wenn du in-game bist settings.fa.patchGamePrefs = Patche game.prefs @@ -1302,4 +1302,4 @@ teammatchmaking.activeGames = Aktive Spiele\: {0,number,#} game.create.generatedMap2 = Karte generieren ignoreWarning = Warnung Ignorieren replay.replayRunning = Wiederholung konnte nicht gestartet werden, da eine andere Wiederholung bereits läuft. -leaderboard.3v3_league = 3v3 Liga \ No newline at end of file +leaderboard.3v3_league = 3v3 Liga diff --git a/src/main/resources/i18n/messages_es.properties b/src/main/resources/i18n/messages_es.properties index fde3eca409..e8d123db87 100644 --- a/src/main/resources/i18n/messages_es.properties +++ b/src/main/resources/i18n/messages_es.properties @@ -805,8 +805,8 @@ settings.account.goWebsite = Para actividades relacionadas con la cuenta, debe v settings.account.goWebsiteButton = Visite el sitio web de FAForever map.versionId = ID de la versión del mapa vault.replays.ownReplays = Tus repeticiones -modVault.details.uploader = Subido por\: {0} -modVault.details.author = Escrito por\: {0} +modVault.details.uploader = Subido por\: +modVault.details.author = Escrito por\: gameSelect.select.invalidPath = Ruta no válida gamePath.select.noneChosen = ¡No seleccionaste una ubicación de juego\! gamePath.select.noValidExe = La ubicación especificada no contiene un Supreme Commander.exe válido y, por lo tanto, no es una instalación válida de Forged Alliance. @@ -964,7 +964,7 @@ settings.chat.dateFormat = Formato de fecha settings.chat.dateFormat.description = En qué formato se debe mostrar la fecha en el chat. chat.error.noHashTag = El nombre del canal debe comenzar con \# (prueba con \# {0}) game.gameStatus.hosting = Hospedando -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = Copiar settings.fa.allowReplayWhileInGame = Permitir ver repeticiones en el juego settings.fa.patchGamePrefs = Parche Game.prefs @@ -1312,4 +1312,4 @@ chat.userContext.changeColor = Cambiar el color chat.sendFailed = No se puede enviar el mensaje userInfo.ratingHistory.lastWeek = La semana pasada userInfo.ratingHistory.lastDay = El día anterior -chat.topicUpdated = El tema del canal ha sido actualizado. DE\: "{0}" A\: "{1}" \ No newline at end of file +chat.topicUpdated = El tema del canal ha sido actualizado. DE\: "{0}" A\: "{1}" diff --git a/src/main/resources/i18n/messages_fr.properties b/src/main/resources/i18n/messages_fr.properties index 1f65b95caf..d6d5028ef7 100644 --- a/src/main/resources/i18n/messages_fr.properties +++ b/src/main/resources/i18n/messages_fr.properties @@ -773,8 +773,8 @@ settings.account.goWebsite = Pour la plupart des activités liées au compte, ve settings.account.goWebsiteButton = Visiter le site web de FAForever map.versionId = Version ID de la carte vault.replays.ownReplays = Vos rediffusions -modVault.details.uploader = Uploadé par \: {0} -modVault.details.author = Créé par \: {0}\n +modVault.details.uploader = Uploadé par \: +modVault.details.author = Créé par \: gameSelect.select.invalidPath = Chemin non valide gamePath.select.noneChosen = Vous n'avez pas sélectionné le répertoire du jeu \! gamePath.select.noValidExe = Le répertoire sélectionné ne contient pas de Supreme Commander.exe valide et n'est donc pas une installation Forged Alliance valide. @@ -936,7 +936,7 @@ settings.chat.dateFormat = Format des dates settings.chat.dateFormat.description = Choix du format d'affichage des dates chat.error.noHashTag = Le nom de canal doit commencer par \# (Essayez \#{0}) game.gameStatus.hosting = En attente d'autres joueurs -mod.idNumber = \#{0} +mod.idNumber = \# # Noun or Verb? # Fuzzy label.copy = Copier @@ -1355,4 +1355,4 @@ teammatchmaking.searchButton.inParty=Le chef d'équipe démarre la recherche de teammatchmaking.searchButton.inQueue=Votre équipe recherche maintenant une partie leaderboard.tmm_3v3.name=3c3 reviews.averageScore=Score moyen -login.userBaseUrl=Adresse de l'API utilisateur \ No newline at end of file +login.userBaseUrl=Adresse de l'API utilisateur diff --git a/src/main/resources/i18n/messages_it.properties b/src/main/resources/i18n/messages_it.properties index 869bf6e384..6255d45d66 100644 --- a/src/main/resources/i18n/messages_it.properties +++ b/src/main/resources/i18n/messages_it.properties @@ -792,8 +792,8 @@ settings.account.goWebsite = Per la maggior parte delle attività relative all'a settings.account.goWebsiteButton = Visita il sito web Faforever map.versionId = ID versione Mappa vault.replays.ownReplays = I tuoi replay -modVault.details.uploader = Caricato da\: {0} -modVault.details.author = Creato da\: {0} +modVault.details.uploader = Caricato da\: +modVault.details.author = Creato da\: gameSelect.select.invalidPath = Percorso non valido gamePath.select.noneChosen = Non hai selezionato il percorso del gioco\! gamePath.select.noValidExe = Il percorso specificato non contiene un valido Supreme Commander.exe e quindi non è presente una valida installazione di Forged Alliance. @@ -956,7 +956,7 @@ settings.chat.dateFormat = Formato Data settings.chat.dateFormat.description = Il formato in cui dovrebbero essere visualizzate le date in chat. chat.error.noHashTag = Nome Canale deve iniziare con \# (Prova \#{0}) game.gameStatus.hosting = Ospitando -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = copia settings.fa.allowReplayWhileInGame = Permetti visualizzazione replay durante la partita settings.fa.patchGamePrefs = Patch Game.prefs @@ -1144,4 +1144,4 @@ login.oauthBaseUrl = OAuth URL base session.expired.title = Sessione Scaduta session.expired.message = Sessione scaduta, perfavore inserire i dati di login di nuovo login.error = Errore occorso durante il login, errore\: {0}; {1} -discord.couldNotOpen = Non è stato possibile aprire il gioco da discord \ No newline at end of file +discord.couldNotOpen = Non è stato possibile aprire il gioco da discord diff --git a/src/main/resources/i18n/messages_ko.properties b/src/main/resources/i18n/messages_ko.properties index 8a35d77b11..a6b65561b8 100644 --- a/src/main/resources/i18n/messages_ko.properties +++ b/src/main/resources/i18n/messages_ko.properties @@ -790,8 +790,8 @@ settings.account.goWebsite=계정 관련 활동의 경우 당사 웹 사이트 settings.account.goWebsiteButton=Faforever 웹 사이트 방문하기 map.versionId=지도 버전 ID vault.replays.ownReplays=당신의 리플레이 -modVault.details.uploader=업로드 한 사람 \: {0} -modVault.details.author=작성자\: {0} +modVault.details.uploader=업로드 한 사람 \: +modVault.details.author=작성자\: gameSelect.select.invalidPath=유효하지 않은 경로 gamePath.select.noneChosen=게임 위치를 선택하지 않았습니다\! gamePath.select.noValidExe=지정된 위치에 유효한 Supreme Commander.exe가 포함되어 있지 않으므로 유효한 Forged Alliance 설치가 아닙니다. @@ -1301,4 +1301,4 @@ chat.userContext.changeColor=색상 변경 chat.sendFailed=메시지를 보낼 수 없습니다 userInfo.ratingHistory.lastWeek=지난 1주 userInfo.ratingHistory.lastDay=지난 1일 -chat.topicUpdated=채널 주제가 업데이트되었습니다. 이전\: "{0}" 이후\: "{1}" \ No newline at end of file +chat.topicUpdated=채널 주제가 업데이트되었습니다. 이전\: "{0}" 이후\: "{1}" diff --git a/src/main/resources/i18n/messages_nl.properties b/src/main/resources/i18n/messages_nl.properties index 274bfdb428..417b8caa6e 100644 --- a/src/main/resources/i18n/messages_nl.properties +++ b/src/main/resources/i18n/messages_nl.properties @@ -794,8 +794,8 @@ settings.account.goWebsite = Voor de meeste account-gerelateerde activiteiten mo settings.account.goWebsiteButton = Bezoek de Faforever website map.versionId = Map versie ID vault.replays.ownReplays = Jouw replays -modVault.details.uploader = Geüpload door\: [0} -modVault.details.author = Ontwikkeld door\: {0} +modVault.details.uploader = Geüpload door\: +modVault.details.author = Ontwikkeld door\: gameSelect.select.invalidPath = Ongeldig pad gamePath.select.noneChosen = Je hebt geen game locatie geselecteerd\! gamePath.select.noValidExe = De opgegeven locatie bevat geen geldige Supreme Commander.exe en is dus geen geldige Forged Alliance-installatie. @@ -952,7 +952,7 @@ settings.chat.dateFormat = Formaat datum settings.chat.dateFormat.description = In welke opmaak de datum wordt laten zien in de chat. chat.error.noHashTag = Kanaal Naam moet starten met \# (Probeer \#{0}) game.gameStatus.hosting = Hosting -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = kopie settings.fa.allowReplayWhileInGame = Laat herhalingen kjken toe in het spel. settings.fa.patchGamePrefs = Patch Game.prefs @@ -1061,4 +1061,4 @@ management.maps.uninstall.error = Kan de map niet deïnstalleren game.filter.numberOfPlayers = Aantal spelers game.filter.mapHeight = Map hoogte, in km game.filter.mapWidth = Map breedte, in km -teammatchmaking.search.prompt = Naam \ No newline at end of file +teammatchmaking.search.prompt = Naam diff --git a/src/main/resources/i18n/messages_pl.properties b/src/main/resources/i18n/messages_pl.properties index 7767c933b1..df4a99d063 100644 --- a/src/main/resources/i18n/messages_pl.properties +++ b/src/main/resources/i18n/messages_pl.properties @@ -807,8 +807,8 @@ settings.account.goWebsite = W celu podjęcia działań związanych z kontem nal settings.account.goWebsiteButton = Odwiedź stronę FAForever map.versionId = ID wersji mapy vault.replays.ownReplays = Twoje powtórki -modVault.details.uploader = Umieszczone przez\: {0} -modVault.details.author = Autorstwa\: {0} +modVault.details.uploader = Umieszczone przez\: +modVault.details.author = Autorstwa\: gameSelect.select.invalidPath = Niewłaściwa ścieżka gamePath.select.noneChosen = Nie wybrałeś folderu, w którym znajduje się gra\! gamePath.select.noValidExe = Podany folder nie zawiera prawidłowego pliku Supreme Commander.exe i dlatego nie jest on prawidłową lokalizacją instalacji Forged Alliance. @@ -993,7 +993,7 @@ settings.chat.dateFormat = Format Daty settings.chat.dateFormat.description = W jakim formacie powinna być wyświetlana data w czacie. chat.error.noHashTag = Nazwa Kanału musi rozpoczynać się od \# (Spróbuj \#{0}) game.gameStatus.hosting = Hostowanie -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = kopiuj settings.fa.allowReplayWhileInGame = Pozwalaj na oglądanie powtórek będąc w grze # Fuzzy @@ -1442,4 +1442,4 @@ teammatchmaking.searchButton.inQueue = Twoje party szuka teraz gry leaderboard.tmm_3v3.name = 3v3 reviews.averageScore=Średnia ocen # Fuzzy -login.userBaseUrl=Podstawowy adres URL API użytkownika \ No newline at end of file +login.userBaseUrl=Podstawowy adres URL API użytkownika diff --git a/src/main/resources/i18n/messages_ru.properties b/src/main/resources/i18n/messages_ru.properties index e4ccb0fa9a..148252d7df 100644 --- a/src/main/resources/i18n/messages_ru.properties +++ b/src/main/resources/i18n/messages_ru.properties @@ -815,8 +815,8 @@ settings.account.goWebsite = Для большинства действий, с settings.account.goWebsiteButton = Посетить веб-сайт FAF map.versionId = Версия карты ID vault.replays.ownReplays = Ваши реплеи -modVault.details.uploader = Загружено\: {0} -modVault.details.author = Автор\: {0} +modVault.details.uploader = Загружено\: +modVault.details.author = Автор\: gameSelect.select.invalidPath = Неверный путь gamePath.select.noneChosen = Вы не выбрали папку с игрой\! gamePath.select.noValidExe = В указанном месте нет действительного файла Supreme Commander.exe поэтому установка Forged Alliance недопустима. @@ -980,7 +980,7 @@ settings.chat.dateFormat = Формат даты settings.chat.dateFormat.description = В каком виде дата должна отображаться в чате chat.error.noHashTag = Имя канала должно начинаться с \# (т.е \#{0}) game.gameStatus.hosting = Хост -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = Копировать settings.fa.allowReplayWhileInGame = Разрешить просмотр реплеев во время игры settings.fa.patchGamePrefs = Модифицировать game.prefs @@ -1375,4 +1375,4 @@ teammatchmaking.searchButton.inGame=Невозможно начать подбо teammatchmaking.searchButton.memberInGame=Невозможно начать подбор матча, пока кто-то в другой игре teammatchmaking.searchButton.inParty=Лидер группы начнёт подбор матча teammatchmaking.searchButton.inQueue=Ваша группа подбирает матч -leaderboard.tmm_3v3.name=3v3 \ No newline at end of file +leaderboard.tmm_3v3.name=3v3 diff --git a/src/main/resources/i18n/messages_tr.properties b/src/main/resources/i18n/messages_tr.properties index f4c4a298aa..6461b51a63 100644 --- a/src/main/resources/i18n/messages_tr.properties +++ b/src/main/resources/i18n/messages_tr.properties @@ -785,8 +785,8 @@ settings.account.goWebsite = Hesap ilişkili aktiviteler için web sitemizi ziya settings.account.goWebsiteButton = Faforever websitesini ziyaret et map.versionId = Harita sürüm ID'si vault.replays.ownReplays = Tekrarlarınız -modVault.details.uploader = {0} tarafından karşıya yüklendi -modVault.details.author = yazar \: {0} +modVault.details.uploader = tarafından karşıya yüklendi +modVault.details.author = yazar \: gameSelect.select.invalidPath = geçersiz dizin gamePath.select.noneChosen = Oyun konumu seçmediniz gamePath.select.noValidExe = Belirtilen dosya yolunda düzgün bir Supreme Commander.exe bulunmamaktadır, bundan ötürü düzgün bir Forged Alliance yüklemesi de yoktur. @@ -926,7 +926,7 @@ settings.date.dmy = gün/ay/yıl settings.chat.dateFormat = tarih biçimi chat.error.noHashTag = Kanal adı \# (dene \#{0}) ile başlamalı game.gameStatus.hosting = Ağırlanıyor -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = kopyala settings.fa.allowReplayWhileInGame.experimental = deneysel chat.userColor = Renk @@ -937,4 +937,4 @@ modVault.upload.rules = Mod yükleme konusundaki kuralları okuduğumu onaylıyo saveQuery = Kayıt Geçmişi logical = Gelişmiş Arama filter = Aramayı Süz -main.replay = Tekrarlar \ No newline at end of file +main.replay = Tekrarlar diff --git a/src/main/resources/i18n/messages_uk.properties b/src/main/resources/i18n/messages_uk.properties index 2bed75e487..d640b63670 100644 --- a/src/main/resources/i18n/messages_uk.properties +++ b/src/main/resources/i18n/messages_uk.properties @@ -803,8 +803,8 @@ settings.account.goWebsite = Для більшості дій пов'язани settings.account.goWebsiteButton = Відвідати FAForever сайт map.versionId = Версія мапи ID vault.replays.ownReplays = Ваші записи -modVault.details.uploader = Завантажено\: {0} -modVault.details.author = Створено\: {0} +modVault.details.uploader = Завантажено\: +modVault.details.author = Створено\: gameSelect.select.invalidPath = Недоступний шлях gamePath.select.noneChosen = Ви не обрали папку з грою\! gamePath.select.noValidExe = У вибраному місці не знайдений Supreme Commander.exe і тому не є дійсним Forged Alliance installation. @@ -961,7 +961,7 @@ settings.chat.dateFormat = Формат Дати settings.chat.dateFormat.description = В якому форматі показувати дату в чаті. chat.error.noHashTag = Назва Каналу повинна починатися з \# (Спробуйте\#{0}) game.gameStatus.hosting = Хостинг -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = копіювати settings.fa.allowReplayWhileInGame = Дозволити перегляд повторів під час гри settings.fa.patchGamePrefs = Пропатчити Game.prefs @@ -1344,4 +1344,4 @@ game.create.generatedMap2 = Згенеруйте карту settings.fa.allowIpv6 = Дозвольте адаптеру ICE використовувати IPv6 settings.fa.allowIpv6.description = IPv6 викликає проблеми з підключенням для деяких гравців. Увімкніть це, якщо у вас немає проблем із підключенням IPv6 home.directory.warning.cyrillic = Попередження\: кириличні символи в шляху домашнього каталогу можуть спричинити проблеми. Будь ласка, уникайте їх використання. -ignoreWarning = Ігрнорувати УВАГУ \ No newline at end of file +ignoreWarning = Ігрнорувати УВАГУ diff --git a/src/main/resources/i18n/messages_zh.properties b/src/main/resources/i18n/messages_zh.properties index c9353cdb54..fc9c286315 100644 --- a/src/main/resources/i18n/messages_zh.properties +++ b/src/main/resources/i18n/messages_zh.properties @@ -792,8 +792,8 @@ settings.account.goWebsite = 与帐号相关的活动您必须前往我们的网 settings.account.goWebsiteButton = 访问FAForever网站 map.versionId = 地图版本ID vault.replays.ownReplays = 我的重播 -modVault.details.uploader = 由：{0} 上传 -modVault.details.author = 由：{0} 创作 +modVault.details.uploader = 由： 上传 +modVault.details.author = 由： 创作 gameSelect.select.invalidPath = 无效的路径 gamePath.select.noneChosen = 您还未指定游戏档案所在位置。 gamePath.select.noValidExe = 找不到有效的游戏安装路径，因为指定的位置无法找到<最高指挥官：钢铁同盟>。 @@ -954,7 +954,7 @@ settings.chat.dateFormat = 日期格式 settings.chat.dateFormat.description = 将会套用于聊天室的日期格式。 chat.error.noHashTag = 频道名称开头必须为 \# (Try \#{0}) game.gameStatus.hosting = 主持游戏中 -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = 复制 settings.fa.allowReplayWhileInGame = 允许观察 settings.fa.patchGamePrefs = 修复Game.prefs @@ -1386,4 +1386,4 @@ teammatchmaking.searchButton.memberInGame = 当某人在对接中时无法加入 # Fuzzy teammatchmaking.searchButton.inParty = 组织者将开始匹配 teammatchmaking.searchButton.inQueue = 您的队伍现在正在搜索游戏 -leaderboard.tmm_3v3.name = 3v3 \ No newline at end of file +leaderboard.tmm_3v3.name = 3v3 diff --git a/src/main/resources/i18n/messages_zh_TW.properties b/src/main/resources/i18n/messages_zh_TW.properties index e2145c3bc1..c895a56872 100644 --- a/src/main/resources/i18n/messages_zh_TW.properties +++ b/src/main/resources/i18n/messages_zh_TW.properties @@ -742,8 +742,8 @@ settings.account.goWebsite = 您必須前往我們的網頁才能變更帳號相 settings.account.goWebsiteButton = 造訪FA Forever網站 map.versionId = 地圖版本ID vault.replays.ownReplays = 我的重播 -modVault.details.uploader = 由：{0} 上傳 -modVault.details.author = 由：{0} 創作 +modVault.details.uploader = 由： 上傳 +modVault.details.author = 由： 創作 gameSelect.select.invalidPath = 無效的路徑 gamePath.select.noneChosen = 您尚未指定遊戲檔案的安裝位置。 gamePath.select.noValidExe = 找不到有效的遊戲安裝路徑，因為指定的位置無法找到<最高指揮官：鋼鐵同盟>。 @@ -903,7 +903,7 @@ settings.chat.dateFormat = 日期格式 settings.chat.dateFormat.description = 將會套用於聊天室的日期格式。 chat.error.noHashTag = 頻道名稱開頭必須為 \# (Try \#{0}) game.gameStatus.hosting = 主持遊戲中 -mod.idNumber = \#{0} +mod.idNumber = \# label.copy = 複製 settings.fa.allowReplayWhileInGame = 允許旁觀 settings.fa.patchGamePrefs = 修改Game.prefs diff --git a/src/main/resources/theme/vault/mod/mod_detail.fxml b/src/main/resources/theme/vault/mod/mod_detail.fxml index 5862fb173a..437f63f4c0 100644 --- a/src/main/resources/theme/vault/mod/mod_detail.fxml +++ b/src/main/resources/theme/vault/mod/mod_detail.fxml @@ -3,13 +3,13 @@ - + @@ -22,12 +22,13 @@ - + + + - - - + + @@ -37,68 +38,94 @@ -