Merge pull request #678 from huoyaoyuan/locale

Use localisation engine for unicode text.

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -1,19 +1,18 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
 using System.Collections.Generic;
+using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Configuration;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
-using OpenTK;
-using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables
 {
@@ -23,8 +22,6 @@ namespace osu.Game.Beatmaps.Drawables
         private readonly SpriteText title;
         private readonly SpriteText artist;
 
-        private Bindable<bool> preferUnicode;
-
         private readonly WorkingBeatmap beatmap;
         private readonly FillFlowContainer difficultyIcons;
 
@@ -82,15 +79,12 @@ namespace osu.Game.Beatmaps.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(LocalisationEngine localisation)
         {
-            preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
+            title.Current = localisation.GetUnicodePreference(
-            preferUnicode.ValueChanged += unicode =>
+                beatmap.BeatmapSetInfo.Metadata.TitleUnicode, beatmap.BeatmapSetInfo.Metadata.Title);
-            {
+            artist.Current = localisation.GetUnicodePreference(
-                title.Text =  unicode ? beatmap.BeatmapSetInfo.Metadata.TitleUnicode : beatmap.BeatmapSetInfo.Metadata.Title;
+                beatmap.BeatmapSetInfo.Metadata.ArtistUnicode, beatmap.BeatmapSetInfo.Metadata.Artist);
-                artist.Text = unicode ? beatmap.BeatmapSetInfo.Metadata.ArtistUnicode : beatmap.BeatmapSetInfo.Metadata.Artist;
-            };
-            preferUnicode.TriggerChange();
         }
 
         private class PanelBackground : BufferedContainer
@@ -112,7 +106,7 @@ namespace osu.Game.Beatmaps.Drawables
                         Depth = -1,
                         Direction = FillDirection.Horizontal,
                         RelativeSizeAxes = Axes.Both,
-                        // This makes the gradient not be perfectly horizontal, but diagonal at a ~40<EFBFBD> angle
+                        // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                         Shear = new Vector2(0.8f, 0),
                         Alpha = 0.5f,
                         Children = new[]

osu.Game/Configuration/OsuConfigManager.cs

@@ -92,7 +92,6 @@ namespace osu.Game.Configuration
             Set(OsuConfig.IgnoreBeatmapSamples, false).Disabled = true;
             Set(OsuConfig.IgnoreBeatmapSkins, false).Disabled = true;
             Set(OsuConfig.IgnoreList, string.Empty).Disabled = true;
-            Set(OsuConfig.Language, @"unknown").Disabled = true;
             Set(OsuConfig.AllowNowPlayingHighlights, false).Disabled = true;
             Set(OsuConfig.LastVersion, string.Empty).Disabled = true;
             Set(OsuConfig.LastVersionPermissionsFailed, string.Empty).Disabled = true;
@@ -163,16 +162,6 @@ namespace osu.Game.Configuration
             Set(OsuConfig.UpdateFailCount, 0).Disabled = true;
             //Set(OsuConfig.TreeSortMode, TreeGroupMode.Show_All).Disabled = true;
             //Set(OsuConfig.TreeSortMode2, TreeSortMode.Title).Disabled = true;
-            bool unicodeDefault = false;
-            switch (Get<string>(OsuConfig.Language))
-            {
-                case @"zh":
-                case @"ja":
-                case @"ko":
-                    unicodeDefault = true;
-                    break;
-            }
-            Set(OsuConfig.ShowUnicode, unicodeDefault);
             Set(OsuConfig.PermanentSongInfo, false).Disabled = true;
             Set(OsuConfig.Ticker, false).Disabled = true;
             Set(OsuConfig.CompatibilityContext, false).Disabled = true;
@@ -339,7 +328,6 @@ namespace osu.Game.Configuration
         SaveUsername,
         TreeSortMode,
         TreeSortMode2,
-        ShowUnicode,
         PermanentSongInfo,
         Ticker,
         CompatibilityContext,

osu.Game/Overlays/MusicController.cs

@@ -10,20 +10,20 @@ using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
+using osu.Framework.Localisation;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics;
-using osu.Framework.Graphics.Primitives;
 using osu.Game.Graphics.Sprites;
-using osu.Framework.Extensions;
-using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Overlays
 {
@@ -41,9 +41,9 @@ namespace osu.Game.Overlays
 
         private TrackManager trackManager;
         private Bindable<WorkingBeatmap> beatmapSource;
-        private Bindable<bool> preferUnicode;
         private WorkingBeatmap current;
         private BeatmapDatabase beatmaps;
+        private LocalisationEngine localisation;
 
         private Container dragContainer;
 
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
+        private void load(OsuGameBase game, BeatmapDatabase beatmaps, OsuColour colours, LocalisationEngine localisation)
         {
             Children = new Drawable[]
             {
@@ -187,8 +187,7 @@ namespace osu.Game.Overlays
 
             this.beatmaps = beatmaps;
             trackManager = game.Audio.Track;
-            preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
+            this.localisation = localisation;
-            preferUnicode.ValueChanged += unicode => updateDisplay(current, TransformDirection.None);
 
             beatmapSource = game.Beatmap ?? new Bindable<WorkingBeatmap>();
             playList = beatmaps.GetAllWithChildren<BeatmapSetInfo>();
@@ -308,16 +307,19 @@ namespace osu.Game.Overlays
             {
                 Task.Run(() =>
                 {
-                    if (beatmap?.Beatmap == null)
+                    if (beatmap?.Beatmap == null) //this is not needed if a placeholder exists
                     {
+                        title.Current = null;
                         title.Text = @"Nothing to play";
+
+                        artist.Current = null;
                         artist.Text = @"Nothing to play";
                     }
                     else
                     {
                         BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata;
-                        title.Text = preferUnicode ? metadata.TitleUnicode : metadata.Title;
+                        title.Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title);
-                        artist.Text = preferUnicode ? metadata.ArtistUnicode : metadata.Artist;
+                        artist.Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist);
                     }
                 });
 

osu.Game/Overlays/Options/Sections/General/LanguageOptions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
@@ -13,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections.General
         protected override string Header => "Language";
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager osuConfig, FrameworkConfigManager frameworkConfig)
         {
             Children = new Drawable[]
             {
@@ -21,12 +22,12 @@ namespace osu.Game.Overlays.Options.Sections.General
                 new OsuCheckbox
                 {
                     LabelText = "Prefer metadata in original language",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ShowUnicode)
+                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkConfig.ShowUnicode)
                 },
                 new OsuCheckbox
                 {
                     LabelText = "Use alternative font for chat display",
-                    Bindable = config.GetBindable<bool>(OsuConfig.AlternativeChatFont)
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.AlternativeChatFont)
                 },
             };
         }

osu.Game/Screens/Ranking/ResultsPageScore.cs

@@ -1,30 +1,29 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Configuration;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Users;
-using OpenTK;
-using OpenTK.Graphics;
-using System;
-using System.Collections.Generic;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Game.Beatmaps;
-using osu.Game.Screens.Play;
-using osu.Game.Rulesets.Scoring;
-using osu.Framework.Graphics.Colour;
-using System.Linq;
 
 namespace osu.Game.Screens.Ranking
 {
@@ -272,8 +271,6 @@ namespace osu.Game.Screens.Ranking
         {
             private readonly BeatmapInfo beatmap;
 
-            private Bindable<bool> preferUnicode;
-
             private readonly OsuSpriteText title;
             private readonly OsuSpriteText artist;
             private readonly OsuSpriteText versionMapper;
@@ -323,20 +320,16 @@ namespace osu.Game.Screens.Ranking
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours, OsuConfigManager config)
+            private void load(OsuColour colours, LocalisationEngine localisation)
             {
                 title.Colour = artist.Colour = colours.BlueDarker;
                 versionMapper.Colour = colours.Gray8;
 
                 versionMapper.Text = $"{beatmap.Version} - mapped by {beatmap.Metadata.Author}";
-
+                title.Current = localisation.GetUnicodePreference(
-                preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
+                    beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title);
-                preferUnicode.ValueChanged += unicode =>
+                artist.Current = localisation.GetUnicodePreference(
-                {
+                    beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist);
-                    title.Text = unicode ? beatmap.Metadata.TitleUnicode : beatmap.Metadata.Title;
-                    artist.Text = unicode ? beatmap.Metadata.ArtistUnicode : beatmap.Metadata.Artist;
-                };
-                preferUnicode.TriggerChange();
             }
         }