Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 11:46:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring directory path for UI resource

Browse Source
This commit is contained in:
bao-qian
2016-01-07 04:47:28 +00:00
parent c8a932b6b3
commit 8504d01688
7 changed files with 37 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Wox.Core/i18n/IInternationalization.cs
View File

@@ -1,24 +0,0 @@
using System.Collections.Generic;
namespace Wox.Core.i18n
{
interface IInternationalization
{
List<Language> LoadAvailableLanguages();
string GetTranslation(string key);
/// <summary>
/// Get language file for current user selected language
/// if couldn't find the current selected language file, it will first try to load en.xaml
/// if en.xaml couldn't find, return empty string
/// </summary>
/// <param name="folder"></param>
/// <returns></returns>
string GetLanguageFile(string folder);
void ChangeLanguage(Language language);
void ChangeLanguage(string languageCode);
}
}

26
Wox.Core/i18n/Internationalization.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Windows;
using Wox.Core.UI;
using Wox.Core.UserSettings;
@@ -12,23 +11,21 @@ using Wox.Plugin;
namespace Wox.Core.i18n
{
public class Internationalization : IInternationalization, IUIResource
public class Internationalization : Resource
{
public const string DirectoryName = "Languages";
private static readonly string DefaultDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), DirectoryName);
static Internationalization()
public Internationalization()
{
DirectoryName = "Languages";
MakesureThemeDirectoriesExist();
}
private static void MakesureThemeDirectoriesExist()
private void MakesureThemeDirectoriesExist()
{
if (!Directory.Exists(DefaultDirectory))
if (!Directory.Exists(DirectoryPath))
{
try
{
Directory.CreateDirectory(DefaultDirectory);
Directory.CreateDirectory(DirectoryPath);
}
catch (Exception e)
{
@@ -70,14 +67,16 @@ namespace Wox.Core.i18n
UserSettingStorage.Instance.Language = language.LanguageCode;
UserSettingStorage.Instance.Save();
ResourceMerger.UpdateResources(this);
ResourceMerger.UpdateResource(this);
}
public ResourceDictionary GetResourceDictionary()
public override ResourceDictionary GetResourceDictionary()
{
return new ResourceDictionary
{
Source = new Uri(GetLanguageFile(DefaultDirectory), UriKind.Absolute)
Source = new Uri(GetLanguageFile(DirectoryPath), UriKind.Absolute)
};
}
@@ -124,7 +123,7 @@ namespace Wox.Core.i18n
private string GetLanguagePath(Language language)
{
string path = Path.Combine(DefaultDirectory, language.LanguageCode + ".xaml");
string path = Path.Combine(DirectoryPath, language.LanguageCode + ".xaml");
if (File.Exists(path))
{
return path;
@@ -156,4 +155,5 @@ namespace Wox.Core.i18n
}
}
}