From dd90b2bacc46149fc04503758e149f921a647b3d Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 16 Jan 2022 19:10:30 +0200 Subject: [PATCH] NewGameScreen threading normalized. The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless. --- .../Brazilian_Portuguese.properties | 2 +- .../jsons/translations/Bulgarian.properties | 2 +- .../jsons/translations/Czech.properties | 2 +- .../jsons/translations/Dutch.properties | 2 +- .../jsons/translations/English.properties | 2 +- .../jsons/translations/Filipino.properties | 2 +- .../jsons/translations/Finnish.properties | 2 +- .../jsons/translations/French.properties | 2 +- .../jsons/translations/German.properties | 2 +- .../jsons/translations/Greek.properties | 2 +- .../jsons/translations/Hungarian.properties | 2 +- .../jsons/translations/Indonesian.properties | 2 +- .../jsons/translations/Italian.properties | 2 +- .../jsons/translations/Japanese.properties | 2 +- .../jsons/translations/Korean.properties | 2 +- .../jsons/translations/Lithuanian.properties | 2 +- .../jsons/translations/Malay.properties | 2 +- .../Persian_(Pinglish-DIN).properties | 2 +- .../Persian_(Pinglish-UN).properties | 2 +- .../jsons/translations/Polish.properties | 2 +- .../jsons/translations/Portuguese.properties | 2 +- .../jsons/translations/Romanian.properties | 2 +- .../jsons/translations/Russian.properties | 2 +- .../Simplified_Chinese.properties | 2 +- .../jsons/translations/Spanish.properties | 2 +- .../jsons/translations/Swedish.properties | 2 +- .../assets/jsons/translations/Thai.properties | 2 +- .../Traditional_Chinese.properties | 2 +- .../jsons/translations/Turkish.properties | 2 +- .../jsons/translations/Ukrainian.properties | 2 +- .../jsons/translations/Vietnamese.properties | 2 +- .../jsons/translations/template.properties | 2 +- .../unciv/ui/multiplayer/MultiplayerScreen.kt | 2 +- .../unciv/ui/newgamescreen/NewGameScreen.kt | 41 ++++++++----------- 34 files changed, 51 insertions(+), 56 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index a9da298bdb..492e618979 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -519,7 +519,7 @@ Invalid game ID! = ID de partida inválida! Copy user ID = Copiar ID de usuário Copy game ID = Copiar ID da partida UserID copied to clipboard = ID de usuário copiada -GameID copied to clipboard = ID da partida copiada +Game ID copied to clipboard! = ID da partida copiada Set current user = Definir usuário atual Player ID from clipboard = ID de jogador da área de transferência To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Para criar uma partida multijogador, verifique a opção "multijogador" na tela de Nova Partida, e para cada jogador humano coloque o ID de usuário. diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 60d633cfca..779d448c7f 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -576,7 +576,7 @@ Invalid game ID! = Невалидно ID! Copy user ID = Копиране на user ID Copy game ID = Копиране на game ID UserID copied to clipboard = UserID е копирано -GameID copied to clipboard = GameID е копирано +Game ID copied to clipboard! = GameID е копирано Set current user = Избор на текущ потребител Player ID from clipboard = Копирано Player ID To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = За да започнете Multiplayer игра, проверете 'multiplayer' ключа в екрана Нова Игра, и за всеки играч добавете неговото ID. diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 5fc6ead219..cdc6ac13fd 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -436,7 +436,7 @@ Invalid game ID! = Chybné ID hry Copy user ID = Kopírovat uživatelské ID Copy game ID = Kopírovat ID hry UserID copied to clipboard = Uživatelské ID zkopírováno do schránky -GameID copied to clipboard = ID hry zkopírováno do schránky +Game ID copied to clipboard! = ID hry zkopírováno do schránky Set current user = Nastavit aktuálního uživatele Player ID from clipboard = Kopírovat ID hráče ze schránky To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Pro vytvoření hry pro více hráčů zaškrtněte 'Více hráčů' na obrazovce s novou hrou a pro každého lidského hráče vložte jeho hráčské ID. diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index b0c8b87036..9fe5750cb9 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -440,7 +440,7 @@ Invalid game ID! = Onjuist spel-ID! Copy user ID = Kopieer Gebruikers-ID Copy game ID = Kopieer Spel-ID UserID copied to clipboard = Gebruikers-ID gekopieerd naar het plakbord -GameID copied to clipboard = Spel-ID gekopieerd naar het plakbord +Game ID copied to clipboard! = Spel-ID gekopieerd naar het plakbord Set current user = Selecteer de huidige gebruiker Player ID from clipboard = Gebruikers-ID van plakbord To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Om een multiplayer spel te maken, klik de 'multiplayer' schakelaar in het Nieuwe Spel scherm en voer voor elke menselijke speler een speler's gebruikers-ID in. diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index ca577c0fa7..cd219a981b 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -802,7 +802,7 @@ Copy game ID = # Requires translation! UserID copied to clipboard = # Requires translation! -GameID copied to clipboard = +Game ID copied to clipboard! = # Requires translation! Set current user = # Requires translation! diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 7f947e32d7..de243cd106 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -675,7 +675,7 @@ Copy game ID = # Requires translation! UserID copied to clipboard = # Requires translation! -GameID copied to clipboard = +Game ID copied to clipboard! = # Requires translation! Set current user = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 1746d85959..69a81402e6 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -554,7 +554,7 @@ Invalid game ID! = Viallinen pelin ID! Copy user ID = Kopioi Käyttäjän ID Copy game ID = Kopioi Pelin ID UserID copied to clipboard = Käyttäjän ID kopioitu leikepöydälle -GameID copied to clipboard = Pelin ID kopioitu leikepöydälle +Game ID copied to clipboard! = Pelin ID kopioitu leikepöydälle Set current user = Aseta tämä käyttäjä Player ID from clipboard = Pelaajan ID leikepöydältä To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Luodaksesi moninpelin aseata 'moninpeli' asetus Uuden Pelin asetuksissa, ja aseta jokaiselle ihmispelaajalle heidän Käyttäjä ID diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 78b07843e6..35fc786938 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -458,7 +458,7 @@ Invalid game ID! = ID de partie invalide ! Copy user ID = Copier l'ID utilisateur Copy game ID = Copier l'ID de partie UserID copied to clipboard = ID utilisateur copié dans le presse-papier -GameID copied to clipboard = ID de partie copié dans le presse-papier +Game ID copied to clipboard! = ID de partie copié dans le presse-papier Set current user = Définir l'utilisateur actuel Player ID from clipboard = Coller l'ID utilisateur depuis le presse-papier To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Pour créer une partie multijoueurs, cochez la case 'multijoueurs' dans l'écran 'Nouvelle Partie' et, pour chaque joueur humain, renseignez l'ID utilisateur du joueur diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 7f380fbdbc..3f03db4541 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -435,7 +435,7 @@ Invalid game ID! = Ungültige Spiel-ID! Copy user ID = Spieler-ID kopieren Copy game ID = Spiel-ID kopieren UserID copied to clipboard = Spieler-ID in die Zwischenablage kopiert -GameID copied to clipboard = Spiel-ID in die Zwischenablage kopiert +Game ID copied to clipboard! = Spiel-ID in die Zwischenablage kopiert Set current user = Aktuellen Spieler eintragen Player ID from clipboard = Spieler-ID aus Zwischenablage To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Um ein Mehrspielerspiel zu erstellen, aktiviere die Option "Online Mehrspieler" in der Ansicht "Neues Spiel" und gib für jeden menschlichen Spieler die Spieler-ID ein. diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index c50f641485..4f486911b9 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -622,7 +622,7 @@ Copy game ID = # Requires translation! UserID copied to clipboard = # Requires translation! -GameID copied to clipboard = +Game ID copied to clipboard! = # Requires translation! Set current user = # Requires translation! diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 8bf244987c..08566d44e9 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -561,7 +561,7 @@ Invalid game ID! = Hibás azonosító! Copy user ID = Felhasználó azonosító másolása Copy game ID = Játék azonosító másolása UserID copied to clipboard = Felhasználó azonosító a vágólapra másolva -GameID copied to clipboard = Játék azonosító a vágólapra másolva +Game ID copied to clipboard! = Játék azonosító a vágólapra másolva Set current user = Jelenlegi játékos beállítása Player ID from clipboard = Játékos azonosító vágólapról To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Multiplayer játék létrehozásához jelöld be a 'multiplayer' opciót az Új játék felületen és minden emberi játékoshoz add meg az azonosítójukat. diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index acd3e1428b..e91b4d6b04 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -435,7 +435,7 @@ Invalid game ID! = Game ID tidak valid! Copy user ID = Salin ID Pengguna Copy game ID = Salin ID Permainan UserID copied to clipboard = ID Pengguna disalin ke papan klip -GameID copied to clipboard = ID Permainan disalin ke papan klip +Game ID copied to clipboard! = ID Permainan disalin ke papan klip Set current user = Atur pengguna saat ini Player ID from clipboard = ID Pemain dari papan klip To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Untuk membuat permainan multiplayer, cek tombol 'Multiplayer' di tampilan Permainan Baru, dan untuk setiap pemain asli, masukkan ID pengguna pemain tersebut. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index d069de434b..46c97c7f8c 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -436,7 +436,7 @@ Invalid game ID! = ID Partita non corretto Copy user ID = Copia ID Utente Copy game ID = Copia ID Partita UserID copied to clipboard = ID Utente copiato negli appunti -GameID copied to clipboard = ID Partita copiato negli appunti +Game ID copied to clipboard! = ID Partita copiato negli appunti Set current user = Imposta utente attuale Player ID from clipboard = Copia ID giocatore dagli appunti To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Per creare una partita multigiocatore, attiva la spunta su 'Multigiocatore' nella schermata Nuova Partita, e inserisci l'ID utente per del giocatore per ogni rispettivo giocatore umano. diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 83998c2670..ee7263f636 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -525,7 +525,7 @@ Invalid game ID! = 無効なゲームID！ Copy user ID = ユーザーIDをコピー Copy game ID = ゲームIDをコピー UserID copied to clipboard = ユーザーIDをクリップボードにコピーしました -GameID copied to clipboard = ゲームIDをクリップボードにコピーしました +Game ID copied to clipboard! = ゲームIDをクリップボードにコピーしました Set current user = 現在のユーザーを設定 Player ID from clipboard = クリップボードのプレーヤーID To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = マルチプレイゲームを作成するには、「新しいゲーム」で「オンラインマルチプレイ」をオンにし、人間のプレイヤーごとにそのプレイヤーのユーザーIDを入れ込みます。 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 6069066d3e..c150592e72 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -502,7 +502,7 @@ Invalid game ID! = 잘못된 게임ID 입니다! Copy user ID = 유저ID 복사 Copy game ID = 게임ID 복사 UserID copied to clipboard = 클립보드에 유저ID가 복사되었습니다 -GameID copied to clipboard = 클립보드에 게임ID가 복사되었습니다 +Game ID copied to clipboard! = 클립보드에 게임ID가 복사되었습니다 Set current user = 현재 사용자 설정 Player ID from clipboard = 클립보드의 플레이어 ID To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = 멀티플레이 게임을 하려면 [새 게임]에서 '멀티플레이'에 체크하고 각 플레이어의 유저ID를 입력하십시오. diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 91d5c70d43..c7f92a9483 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -556,7 +556,7 @@ Invalid game ID! = Netinkamas žaidimoID! Copy user ID = Nukopijuokite vartotojoID Copy game ID = Nukopijuokite žaidimoID UserID copied to clipboard = VartotojoID nukopijuotas į mainų sritį -GameID copied to clipboard = žaidimoID nukopijuotas į mainų sritį +Game ID copied to clipboard! = žaidimoID nukopijuotas į mainų sritį Set current user = Nustatyti dabartinį vartotoją Player ID from clipboard = ŽaidėjoID iš mainų srities To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Norėdami sukurti kelių žaidėjų žaidimą, naujo žaidimo ekrane pažymėkite „daugelio žaidėjų“ jungiklį ir kiekvienam žaidėjui įveskite to žaidėjo vartotojoID. diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index f28c82088c..d29858edb2 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -526,7 +526,7 @@ Invalid game ID! = ID permainan tidak sah! Copy user ID = Salin ID penguna Copy game ID = Salin ID permainan UserID copied to clipboard = ID Pengguna disalin -GameID copied to clipboard = ID Permainan disalin +Game ID copied to clipboard! = ID Permainan disalin Set current user = Set pengguna semasa Player ID from clipboard = ID Pemain dari 'clipboard' To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Untuk memulakan permainan multipemain, semak togol 'multipemain' di skrin Permainan Baru, dan masukkan ID pemain untuk setiap pemain manusia. diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index cd7fb8db63..86262f4093 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -586,7 +586,7 @@ Invalid game ID! = ID e bāzi nā-motabar ast! Copy user ID = Kopi Kardan e ID e Kārbari Copy game ID = Kopi Kardan e ID e Bāzi UserID copied to clipboard = ID e Kārbari kopi šod -GameID copied to clipboard = ID e Bāzi kopi šod +Game ID copied to clipboard! = ID e Bāzi kopi šod Set current user = Ğarār dādan e hamin kārbar Player ID from clipboard = ID e Kārbari e kopi šode To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Barāye sāḵt e yek bāzi čand-nafare, tik e ‘čand-nafare’ rā dar safhe ye Bāzi e Jadid bezanid, va be ezāye har fard ID oo rā vāred konid. diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index d169c9ed81..78feb434a7 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -584,7 +584,7 @@ Invalid game ID! = ID e baazi naa-motabar ast! Copy user ID = Kopi Kardan e ID e Kaarbari Copy game ID = Kopi Kardan e ID e Baazi UserID copied to clipboard = ID e Kaarbari kopi shod -GameID copied to clipboard = ID e Baazi kopi shod +Game ID copied to clipboard! = ID e Baazi kopi shod Set current user = Gharaar daadan e hamin kaarbar Player ID from clipboard = ID e Kaarbari e kopi shode To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Baraaye saakht e yek baazi chand-nafare, tik e ‘chand-nafare’ raa dar safhe ye Baazi e Jadid bezanid, va be ezaaye har fard ID oo raa vaared konid. diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 344d591602..6338107ef3 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -527,7 +527,7 @@ Invalid game ID! = Nieprawidłowy ID gry! Copy user ID = Skopiuj ID użytkownika Copy game ID = Skopiuj ID gry UserID copied to clipboard = ID użytkownika zostało skopiowane do schowka -GameID copied to clipboard = ID gry zostało skopiowane do schowka +Game ID copied to clipboard! = ID gry zostało skopiowane do schowka Set current user = Ustaw bieżącego użytkownika Player ID from clipboard = ID gracza ze schowka To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Aby utworzyć grę wieloosobową, zaznacz pole "Gra Wieloosobowa" w ekranie Nowej Gry i dla każdego ludzkiego gracza wprowadź ID tego gracza. diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 587e34d4b9..3561bf68fb 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -527,7 +527,7 @@ Invalid game ID! = ID de partida inválida Copy user ID = Copiar ID de usuário Copy game ID = Copiar ID de jogo UserID copied to clipboard = Identificação do usuário copiada para área de transferência -GameID copied to clipboard = Identificação da partida copiada para área de transferência +Game ID copied to clipboard! = Identificação da partida copiada para área de transferência Set current user = Definir usuário atual Player ID from clipboard = ID de jogador da prancheta To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Para criar um jogo multijogador, verifica a opção 'multijogador' na tela de Nova Partida, e para cada jogador, coloca o ID de usuário. diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index e2c5bd47ce..b9f6b59fc1 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -446,7 +446,7 @@ Invalid game ID! = ID-ul jocului invalid! Copy user ID = Copiază ID-ul utilizatorului Copy game ID = Copiază ID-ul jocului UserID copied to clipboard = ID-ul utilizatorului copiat în clipboard -GameID copied to clipboard = ID-ul jocului copiat în clipboard +Game ID copied to clipboard! = ID-ul jocului copiat în clipboard Set current user = Pune utilizaorul curent Player ID from clipboard = ID-ul utilizatorului din clipboard To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Pentru a crea un joc multiplayer, activează butonul 'multiplayer' în ecranul 'Joc nou', și pentru fiecare jucător uman inserează ID jucătorului respectiv. diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 6a1f3c978a..7feeed618a 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -437,7 +437,7 @@ Invalid game ID! = Некорректный ID игры! Copy user ID = Скопировать ID игрока Copy game ID = Скопировать ID игры UserID copied to clipboard = ID игрока скопирован в буфер обмена -GameID copied to clipboard = ID игры скопирован в буфер обмена +Game ID copied to clipboard! = ID игры скопирован в буфер обмена Set current user = Выбрать текущего игрока Player ID from clipboard = ID игрока из буфера обмена To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Чтобы создать многопользовательскую игру, поставьте флажок 'Сетевая игра' на экране создания новой игры и для каждого игрока (человека) введите ID игрока. diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 9ec2002931..e47f45ce1b 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -435,7 +435,7 @@ Invalid game ID! = 无效的游戏 ID！ Copy user ID = 复制玩家 ID Copy game ID = 复制游戏 ID UserID copied to clipboard = 玩家 ID 已复制 -GameID copied to clipboard = 游戏 ID 已复制 +Game ID copied to clipboard! = 游戏 ID 已复制 Set current user = 设定为当前玩家 Player ID from clipboard = 从剪贴板获取玩家 ID To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = 创建多人游戏时，首先请选中 “开始新游戏” 界面的 “在线多人游戏” 复选框，同时将每个参与游戏的玩家 ID 填入其想扮演文明的 “玩家 ID” 文本框内。 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 95bc6ac0f6..2efd2c2d96 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -435,7 +435,7 @@ Invalid game ID! = ¡ID de partida no válido! Copy user ID = Copiar ID de usuario Copy game ID = Copiar ID de la partida UserID copied to clipboard = ID de usuario copiado al portapapeles -GameID copied to clipboard = ID del juego copiada al portapapeles +Game ID copied to clipboard! = ID del juego copiada al portapapeles Set current user = Asignar usuario actual Player ID from clipboard = ID de jugador desde el portapapeles To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Para crear un juego multijugador, marque el botón 'multijugador' en la pantalla Nueva Partida, y para cada jugador humano inserte la ID de usuario de ese jugador. diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index f8c18c1aa9..48098f62e8 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -437,7 +437,7 @@ Invalid game ID! = Ogiltigt spel-ID! Copy user ID = Kopiera användar-ID Copy game ID = Kopiera spel-ID UserID copied to clipboard = Användar-ID kopierat till urklipp -GameID copied to clipboard = Spel-ID kopierat till urklipp +Game ID copied to clipboard! = Spel-ID kopierat till urklipp Set current user = Ställ in nuvarande användare Player ID from clipboard = Spelar-ID från urklipp To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = För att skapa ett flerspelarspel, välj 'flerspelar'-alternativet i Nytt Spel-skärme, och infoga användar-ID för varje mänsklig spelare. diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index c707355125..cabbbc104d 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -664,7 +664,7 @@ Copy game ID = # Requires translation! UserID copied to clipboard = # Requires translation! -GameID copied to clipboard = +Game ID copied to clipboard! = # Requires translation! Set current user = # Requires translation! diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 458de0ed70..6cf7851f4a 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -571,7 +571,7 @@ Invalid game ID! = 無效的遊戲ID！ Copy user ID = 複製玩家ID Copy game ID = 複製遊戲ID UserID copied to clipboard = 玩家ID已複製 -GameID copied to clipboard = 遊戲ID已複製 +Game ID copied to clipboard! = 遊戲ID已複製 Set current user = 設定為目前玩家 Player ID from clipboard = 從剪貼簿取得玩家ID To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = 建立多人遊戲時，請先選擇“開始新遊戲”選單的“線上多人遊戲”，並將參與遊戲的玩家ID填入對應扮演的文明的“Player ID”文字框。 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 2c1d74228b..b08353a076 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -495,7 +495,7 @@ Invalid game ID! = Geçersiz oyun kimliği! Copy user ID = Kullanıcı Kimliğini Kopyala Copy game ID = Oyun Kimliğini Kopyala UserID copied to clipboard = Kullanıcı Kimliği panoya kopyalandı -GameID copied to clipboard = Oyun Kimliği panoya kopyalandı +Game ID copied to clipboard! = Oyun Kimliği panoya kopyalandı Set current user = Geçerli kullanıcıyı ayarla Player ID from clipboard = Panodan oyuncu kimliği To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Çok oyunculu bir oyun oluşturmak için Yeni Oyun ekranındaki 'çok oyunculu' kısmını kontrol edin ve her insan oyuncu için o oyuncunun kullanıcı kimliğini girin. diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 8f43ae1ce5..27c01505b1 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -471,7 +471,7 @@ Invalid game ID! = Ідентифікатор гри недійсний! Copy user ID = Копіювати ідентифікатор гравця Copy game ID = Копіювати ідентифікатор гри UserID copied to clipboard = Ідентифікатор користувача скопійовано до буферу -GameID copied to clipboard = Ідентифікатор гри скопійовано до буферу +Game ID copied to clipboard! = Ідентифікатор гри скопійовано до буферу Set current user = Вибрати поточного гравця Player ID from clipboard = Ідентифікатор гравця з буфера обміну To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Для створення багатокористувацької гри перевірте перемикач «Багатокористувацька» у віконці «Нова гра» і для кожної людини-гравця введіть відповідний ідентифікатор. diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index b21d20bd57..8aae06084d 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -337,7 +337,7 @@ Invalid game ID! = ID trò chơi không hợp lệ! Copy User ID = Sao chép ID người dùng Copy Game ID = Sao chép ID trò chơi UserID copied to clipboard = ID người dùng đã được sao chép vào khay nhớ tạm -GameID copied to clipboard = ID trò chơi đã được sao chép vào khay nhớ tạm +Game ID copied to clipboard! = ID trò chơi đã được sao chép vào khay nhớ tạm Set current user = Đặt người dùng hiện tại Player ID from clipboard = ID người chơi từ khay nhớ tạm To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = Để tạo một phòng nhiều người chơi, kiểm tra 'Chơi Trực Tuyến' tại cửa sổ chính. Và với mỗi người chơi, nhập ID của những người chơi đó. diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index e015e9d5d7..817f705de6 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -438,7 +438,7 @@ Invalid game ID! = Copy user ID = Copy game ID = UserID copied to clipboard = -GameID copied to clipboard = +Game ID copied to clipboard! = Set current user = Player ID from clipboard = To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID. = diff --git a/core/src/com/unciv/ui/multiplayer/MultiplayerScreen.kt b/core/src/com/unciv/ui/multiplayer/MultiplayerScreen.kt index 3ecb8f8035..e0977957ed 100644 --- a/core/src/com/unciv/ui/multiplayer/MultiplayerScreen.kt +++ b/core/src/com/unciv/ui/multiplayer/MultiplayerScreen.kt @@ -90,7 +90,7 @@ class MultiplayerScreen(previousScreen: BaseScreen) : PickerScreen() { val gameInfo = multiplayerGames[selectedGameFile] if (gameInfo != null) { Gdx.app.clipboard.contents = gameInfo.gameId - ToastPopup("GameID copied to clipboard", this) + ToastPopup("Game ID copied to clipboard!", this) } } rightSideTable.add(copyGameIdButton).row() diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt index 85fcf85814..14f1857455 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt @@ -17,7 +17,6 @@ import com.unciv.ui.pickerscreens.PickerScreen import com.unciv.ui.utils.* import com.unciv.ui.worldscreen.mainmenu.OnlineMultiplayer import java.util.* -import kotlin.concurrent.thread import com.unciv.ui.utils.AutoScrollPane as ScrollPane @@ -177,6 +176,7 @@ class NewGameScreen( } private fun newGameThread() { + val newGame:GameInfo try { newGame = GameStarter.startNewGame(gameSetupInfo) } catch (exception: Exception) { @@ -192,22 +192,18 @@ class NewGameScreen( rightSideButton.enable() rightSideButton.setText("Start game!".tr()) } + return } - if (newGame != null && gameSetupInfo.gameParameters.isOnlineMultiplayer) { - newGame!!.isUpToDate = true // So we don't try to download it from dropbox the second after we upload it - the file is not yet ready for loading! + if (gameSetupInfo.gameParameters.isOnlineMultiplayer) { + newGame.isUpToDate = true // So we don't try to download it from dropbox the second after we upload it - the file is not yet ready for loading! try { - OnlineMultiplayer().tryUploadGame(newGame!!, withPreview = true) + OnlineMultiplayer().tryUploadGame(newGame, withPreview = true) - // Save gameId to clipboard because you have to do it anyway. - Gdx.app.clipboard.contents = newGame!!.gameId - // Popup to notify the User that the gameID got copied to the clipboard - postCrashHandlingRunnable { ToastPopup("gameID copied to clipboard".tr(), game.worldScreen, 2500) } - - GameSaver.autoSave(newGame!!) {} + GameSaver.autoSave(newGame) // Saved as Multiplayer game to show up in the session browser - val newGamePreview = newGame!!.asPreview() + val newGamePreview = newGame.asPreview() GameSaver.saveGame(newGamePreview, newGamePreview.gameId) } catch (ex: Exception) { postCrashHandlingRunnable { @@ -217,11 +213,20 @@ class NewGameScreen( open() } } - newGame = null + return } } - Gdx.graphics.requestRendering() + postCrashHandlingRunnable { + game.loadGame(newGame) + previousScreen.dispose() + if (newGame.gameParameters.isOnlineMultiplayer) { + // Save gameId to clipboard because you have to do it anyway. + Gdx.app.clipboard.contents = newGame.gameId + // Popup to notify the User that the gameID got copied to the clipboard + ToastPopup("Game ID copied to clipboard!".tr(), game.worldScreen, 2500) + } + } } fun updateRuleset() { @@ -248,16 +253,6 @@ class NewGameScreen( newGameOptionsTable.update() } - var newGame: GameInfo? = null - - override fun render(delta: Float) { - if (newGame != null) { - game.loadGame(newGame!!) - previousScreen.dispose() - } - super.render(delta) - } - override fun resize(width: Int, height: Int) { if (stage.viewport.screenWidth != width || stage.viewport.screenHeight != height) { game.setScreen(NewGameScreen(previousScreen, gameSetupInfo))