From 52c58bd7a79f35688dabd9760f7659486b161cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Tue, 12 Sep 2017 10:10:59 +0200 Subject: [PATCH] Updated and added some translation strings --- Output/Languages/English.xml | 5 +++++ Output/PartyModes/Challenge/Languages/English.xml | 1 + .../Default/Screens/PartyScreenChallengeSongs.xml | 4 ++-- Output/PartyModes/TicTacToe/Languages/English.xml | 6 +----- .../Default/Screens/PartyScreenTicTacToeSongs.xml | 6 +++--- .../PartyModeChallenge/CPartyModeChallenge.cs | 14 +++++++------- .../PartyModeTicTacToe/CPartyModeTicTacToe.cs | 8 ++++---- VocaluxeLib/Enums.cs | 6 +++--- VocaluxeLib/Menu/CMenuPartySongSelection.cs | 6 +++--- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index 80fdf299..3455a91f 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -15,6 +15,7 @@ Loaded songs Mouse Memory usage + Game mode Normal Duet Medley @@ -31,6 +32,10 @@ Normal user Administrator Keyboard user + Song source + Playlist + Category + All songs Software OpenGL Direct3D diff --git a/Output/PartyModes/Challenge/Languages/English.xml b/Output/PartyModes/Challenge/Languages/English.xml index 3907bf70..06b3badc 100644 --- a/Output/PartyModes/Challenge/Languages/English.xml +++ b/Output/PartyModes/Challenge/Languages/English.xml @@ -11,6 +11,7 @@ Yes No Next Round + Songs Challenge Mode: Configuration Number of players Number of mics diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeSongs.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeSongs.xml index 3c26cfcd..923ffc68 100644 --- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeSongs.xml +++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeSongs.xml @@ -53,7 +53,7 @@ Center Outline - TR_SCREENCONFIG_SONGSOURCE + TR_SONGSOURCE 75 @@ -67,7 +67,7 @@ Center Outline - TR_SCREENCONFIG_GAMEMODE + TR_GAMEMODE diff --git a/Output/PartyModes/TicTacToe/Languages/English.xml b/Output/PartyModes/TicTacToe/Languages/English.xml index 9dda8f3c..24397b29 100644 --- a/Output/PartyModes/TicTacToe/Languages/English.xml +++ b/Output/PartyModes/TicTacToe/Languages/English.xml @@ -13,15 +13,11 @@ Start Songs Team - Playlist - Category - All songs Tic-Tac-Toe: Configuration Number of players in team 1 Number of players in team 2 Number of fields - Song-Source - Game-Mode + Refill jokers every round Tic-Tac-Toe: Choose Player Team 1 Team 2 diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeSongs.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeSongs.xml index eb1c1a56..e79a08d7 100644 --- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeSongs.xml +++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeSongs.xml @@ -53,7 +53,7 @@ Center Outline - TR_SCREENCONFIG_SONGSOURCE + TR_SONGSOURCE 75 @@ -67,7 +67,7 @@ Center Outline - TR_SCREENCONFIG_GAMEMODE + TR_GAMEMODE @@ -404,4 +404,4 @@ - \ No newline at end of file + diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs index 4ffb9805..b37636e3 100644 --- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs +++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs @@ -175,7 +175,7 @@ namespace VocaluxeLib.PartyModes.Challenge CurrentRoundNr = 1, ProfileIDs = new List(), Sorting = CBase.Config.GetSongSorting(), - SongSource = ESongSource.TR_ALLSONGS, + SongSource = ESongSource.TR_SONGSOURCE_ALLSONGS, PlaylistID = 0, CategoryIndex = 0, GameMode = EGameMode.TR_GAMEMODE_NORMAL, @@ -313,7 +313,7 @@ namespace VocaluxeLib.PartyModes.Challenge { switch(GameData.SongSource) { - case ESongSource.TR_ALLSONGS: + case ESongSource.TR_SONGSOURCE_ALLSONGS: _ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting(); _ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs(); _ScreenSongOptions.Sorting.FilterPlaylistID = -1; @@ -321,7 +321,7 @@ namespace VocaluxeLib.PartyModes.Challenge _ScreenSongOptions.Selection.CategoryChangeAllowed = true; break; - case ESongSource.TR_CATEGORY: + case ESongSource.TR_SONGSOURCE_CATEGORY: _ScreenSongOptions.Sorting.SongSorting = GameData.Sorting; _ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_ON; _ScreenSongOptions.Sorting.FilterPlaylistID = -1; @@ -334,7 +334,7 @@ namespace VocaluxeLib.PartyModes.Challenge _ScreenSongOptions.Selection.CategoryChangeAllowed = false; break; - case ESongSource.TR_PLAYLIST: + case ESongSource.TR_SONGSOURCE_PLAYLIST: _ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting(); _ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_OFF; _ScreenSongOptions.Sorting.FilterPlaylistID = GameData.PlaylistID; @@ -541,7 +541,7 @@ namespace VocaluxeLib.PartyModes.Challenge switch (GameData.SongSource) { - case ESongSource.TR_PLAYLIST: + case ESongSource.TR_SONGSOURCE_PLAYLIST: for (int i = 0; i < CBase.Playlist.GetSongCount(GameData.PlaylistID); i++) { int id = CBase.Playlist.GetSong(GameData.PlaylistID, i).SongID; @@ -550,12 +550,12 @@ namespace VocaluxeLib.PartyModes.Challenge } break; - case ESongSource.TR_ALLSONGS: + case ESongSource.TR_SONGSOURCE_ALLSONGS: ReadOnlyCollection avSongs = CBase.Songs.GetSongs(); GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(EGameMode.TR_GAMEMODE_MEDLEY)).Select(song => song.ID)); break; - case ESongSource.TR_CATEGORY: + case ESongSource.TR_SONGSOURCE_CATEGORY: CBase.Songs.SetCategory(GameData.CategoryIndex); avSongs = CBase.Songs.GetVisibleSongs(); GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(EGameMode.TR_GAMEMODE_MEDLEY)).Select(song => song.ID)); diff --git a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs index 2174d739..fa99918c 100644 --- a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs +++ b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs @@ -155,7 +155,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe CurrentRoundNr = 0, FieldNr = 0, Sorting = CBase.Config.GetSongSorting(), - SongSource = ESongSource.TR_ALLSONGS, + SongSource = ESongSource.TR_SONGSOURCE_ALLSONGS, PlaylistID = 0, CategoryIndex = 0, GameMode = EGameMode.TR_GAMEMODE_NORMAL, @@ -438,7 +438,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe switch (GameData.SongSource) { - case ESongSource.TR_PLAYLIST: + case ESongSource.TR_SONGSOURCE_PLAYLIST: for (int i = 0; i < CBase.Playlist.GetSongCount(GameData.PlaylistID); i++) { int id = CBase.Playlist.GetSong(GameData.PlaylistID, i).SongID; @@ -447,12 +447,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe } break; - case ESongSource.TR_ALLSONGS: + case ESongSource.TR_SONGSOURCE_ALLSONGS: ReadOnlyCollection avSongs = CBase.Songs.GetSongs(); GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(GameData.GameMode)).Select(song => song.ID)); break; - case ESongSource.TR_CATEGORY: + case ESongSource.TR_SONGSOURCE_CATEGORY: CBase.Songs.SortSongs(GameData.Sorting, EOffOn.TR_CONFIG_ON, CBase.Config.GetIgnoreArticles(), "", EDuetOptions.All, -1); CBase.Songs.SetCategory(GameData.CategoryIndex); avSongs = CBase.Songs.GetVisibleSongs(); diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs index 8b58366d..8ba2a416 100644 --- a/VocaluxeLib/Enums.cs +++ b/VocaluxeLib/Enums.cs @@ -216,9 +216,9 @@ namespace VocaluxeLib public enum ESongSource { - TR_ALLSONGS, - TR_CATEGORY, - TR_PLAYLIST + TR_SONGSOURCE_ALLSONGS, + TR_SONGSOURCE_CATEGORY, + TR_SONGSOURCE_PLAYLIST } public enum ESongSorting diff --git a/VocaluxeLib/Menu/CMenuPartySongSelection.cs b/VocaluxeLib/Menu/CMenuPartySongSelection.cs index d4d67d51..dbcb6137 100644 --- a/VocaluxeLib/Menu/CMenuPartySongSelection.cs +++ b/VocaluxeLib/Menu/CMenuPartySongSelection.cs @@ -245,9 +245,9 @@ namespace VocaluxeLib.Menu private void _UpdateSelectSlideVisibility() { _SelectSlides[_SelectSlideNumMedleySongs].Visible = SongMode == EGameMode.TR_GAMEMODE_MEDLEY; - _SelectSlides[_SelectSlidePlaylist].Visible = Source == ESongSource.TR_PLAYLIST; - _SelectSlides[_SelectSlideSorting].Visible = Source == ESongSource.TR_CATEGORY; - _SelectSlides[_SelectSlideCategory].Visible = Source == ESongSource.TR_CATEGORY; + _SelectSlides[_SelectSlidePlaylist].Visible = Source == ESongSource.TR_SONGSOURCE_PLAYLIST; + _SelectSlides[_SelectSlideSorting].Visible = Source == ESongSource.TR_SONGSOURCE_CATEGORY; + _SelectSlides[_SelectSlideCategory].Visible = Source == ESongSource.TR_SONGSOURCE_CATEGORY; } protected void _SetAllowedOptions()