Merge pull request #3 from rasyidf/feature-lang

Version 0.5 Update

Author: rasyidf

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Fahmi Rasyid
+Copyright (c) 2020 Fahmi Rasyid
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Localization.Demo/App.xaml.cs

@@ -12,7 +12,7 @@ public partial class App : Application
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
-            LocalizationService.Current.Register("Languages","en-US");  
+            LanguageService.Current.Initialize();  
 
         }
 

Localization.Demo/Languages/It-De.json

@@ -0,0 +1,157 @@
+{
+  "AppId": "",
+  "Version": "0.5",
+  "Type": "Multi",
+  "Author": "Rasyid",
+  "Languages": [
+    {
+      "EnglishName": "English",
+      "CultureName": "United Kingdom",
+      "Culture": "en-GB",
+      "RTL" :  "false"
+    },
+    {
+      "EnglishName": "Italian",
+      "CultureName": "Italy",
+      "Culture": "it-IT",
+      "RTL": "false"
+    }
+  ],
+
+  "Data": [
+    {
+      "data": [
+        {
+          "Id": 0,
+          "Title": {
+            "en-GB": "Demo Window",
+            "it-IT": "Demo Window"
+          }
+        },
+        {
+          "Id": 11,
+          "Header": {
+            "en-GB": "File",
+            "it-IT": "File"
+          }
+        },
+        {
+          "Id": 110,
+          "Header": {
+            "en-GB": "Quit",
+            "it-IT": "Quit"
+          }
+        },
+        {
+          "Id": 12,
+          "Header": {
+            "en-GB": "Edit",
+            "it-IT": "Edit"
+          }
+        },
+        {
+          "Id": 120,
+          "Header": {
+            "en-GB": "Cut",
+            "it-IT": "Cut"
+          }
+        },
+        {
+          "Id": 121,
+          "Header": {
+            "en-GB": "Copy",
+            "it-IT": "Copy"
+          }
+        },
+        {
+          "Id": 122,
+          "Header": {
+            "en-GB": "Paste",
+            "it-IT": "Paste"
+          }
+        },
+        {
+          "Id": 123,
+          "Header": {
+            "en-GB": "Option",
+            "it-IT": "Option"
+          }
+        },
+        {
+          "Id": 13,
+          "Header": {
+            "en-GB": "View",
+            "it-IT": "View"
+          }
+        },
+        {
+          "Id": 130,
+          "Header": {
+            "en-GB": "Status Bar",
+            "it-IT": "Status Bar"
+          }
+        },
+        {
+          "Id": 14,
+          "Header": {
+            "en-GB": "Language",
+            "it-IT": "Language"
+          }
+        },
+        {
+          "Id": 15,
+          "Header": {
+            "en-GB": "Help",
+            "it-IT": "Help"
+          }
+        },
+        {
+          "Id": 150,
+          "Header": {
+            "en-GB": "About",
+            "it-IT": "About"
+          }
+        },
+        {
+          "Id": 21,
+          "Text": {
+            "en-GB": "This is rasyidf.localize demo program",
+            "it-IT": "This is rasyidf.localize demo program"
+          }
+        },
+        {
+          "Id": 22,
+          "Text": {
+            "en-GB": "Select your language:",
+            "it-IT": "Select your language:"
+          }
+        },
+        {
+          "Id": 24,
+          "Text": {
+            "en-GB": "Languages :",
+            "it-IT": "Languages :"
+          }
+        },
+        {
+          "Id": 510,
+          "Content": {
+            "en-GB": "Hello",
+            "it-IT": "Hello"
+          }
+        },
+        {
+          "Id": 511,
+          "Header": {
+            "en-GB": "Hello World",
+            "it-IT": "Hello World"
+          },
+          "Text": {
+            "en-GB": "this is a message",
+            "it-IT": "this is a message"
+          }
+        }
+      ]
+    }
+  ]
+}

Localization.Demo/Languages/de-DE.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Pack EnglishName="German" CultureName="Deutsch" Culture="de-DE">
+<Pack AppId="LOCADEMO" version="0.5" Author="Rasyid" EnglishName="German" CultureName="Deutsch" Culture="de-DE">
   <Value Id="0" Title="Demo Window" />
   <Value Id="11" Header="Datei" />
   <Value Id="110" Header="Beenden" />

Localization.Demo/Languages/en-US.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Pack EnglishName="English" CultureName="English" Culture="en-US">
+<Pack AppId="LOCADEMO" version="0.5" Author="Rasyid" EnglishName="English" CultureName="English" Culture="en-US">
   <Value Id="0" Title="Demo Window" />
   <Value Id="11" Header="File" />
   <Value Id="110" Header="Exit" />

Localization.Demo/Languages/id-ID.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Pack EnglishName="Indonesian" CultureName="Bahasa Indonesia" Culture="id-ID">
+<Pack AppId="LOCADEMO" version="0.4" Author="Rasyid" EnglishName="Indonesian" CultureName="Bahasa Indonesia" Culture="id-ID">
   <Value Id="0" Title="Jendela Demonstrasi" />
   <Value Id="11" Header="Berkas" />
   <Value Id="110" Header="Keluar" />

Localization.Demo/Languages/jv-Latn-ID.json

@@ -1,4 +1,8 @@
 {
+  "AppId" : "Demo",
+  "Version" : "0.4",
+  "Type" : "Single",
+  "Author" : "Rasyid",
   "EnglishName": "Javanese",
   "CultureName": "Basa Jawa",
   "Culture": "jv-Latn-ID",

Localization.Demo/Rasyidf.Localization.Demo.csproj

@@ -91,6 +91,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="Languages\It-De.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Localization.Demo/View/MainWindow.xaml

@@ -8,8 +8,8 @@
     xmlns:ul="clr-namespace:Rasyidf.Localization;assembly=Rasyidf.Localization"
     x:Name="Root"
     x:Uid="Root"
-    Width="321.899"
-    Height="338.275"
+    Width="432.425"
+    Height="320.412"
     mc:Ignorable="d">
     <Window.DataContext>
         <demo:MainWindowViewModel />
@@ -21,12 +21,15 @@
     <Window.Resources>
         <DataTemplate x:Key="LanguageDictionaryItemTemplate">
             <TextBlock><Run Text="{Binding EnglishName, Mode=OneWay}" />
-                (<Run Text="{Binding CultureName, Mode=OneWay}" />
-                )</TextBlock>
+                (<Run Text="{Binding CultureName, Mode=OneWay}" />)</TextBlock>
         </DataTemplate>
     </Window.Resources>
     <Grid>
-        <Menu Height="19" VerticalAlignment="Top">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="38*"/>
+            <ColumnDefinition Width="5*"/>
+        </Grid.ColumnDefinitions>
+        <Menu Height="19" VerticalAlignment="Top" Grid.ColumnSpan="2">
             <MenuItem Header="{ul:Tr File, Uid=11}">
                 <MenuItem Header="{ul:Tr Exit, Uid=110}" />
             </MenuItem>
@@ -57,7 +60,7 @@
         <TextBlock
             Margin="10,24,10,0"
             VerticalAlignment="Top"
-            TextWrapping="Wrap">
+            TextWrapping="Wrap" Grid.ColumnSpan="2" Height="16">
             <TextBlock.Text>
                 <ul:Tr Uid="21" Default="This is Dynamic Language Demo" />
             </TextBlock.Text>
@@ -68,15 +71,13 @@
             VerticalAlignment="Top"
             Text="{ul:Tr 'Select Language :',
                          Uid=22}"
-            TextWrapping="Wrap" />
+            TextWrapping="Wrap" Height="16" Width="92" />
         <ListBox
-            Height="140"
-            Margin="10,81,10,0"
-            VerticalAlignment="Top"
+            Margin="10,81,10,76"
             ItemTemplate="{DynamicResource LanguageDictionaryItemTemplate}"
             ItemsSource="{Binding Cultures}"
             SelectedItem="{Binding SelectedPack}" />
-        <StatusBar Height="24" VerticalAlignment="Bottom">
+        <StatusBar Height="24" VerticalAlignment="Bottom" Grid.ColumnSpan="2">
             <StatusBarItem Height="24" Width="100" VerticalAlignment="Top" >
                 <TextBlock Text="{ul:Tr 'Languages',
                          Uid=24}"/>
@@ -88,6 +89,6 @@
                             Path="LanguageCount" />
             </StatusBarItem>
         </StatusBar>
-        <Button Content="{ul:Tr Hallo, Uid=510}" Margin="73,0,0,29" Command="{Binding ShowMessageCommand}" VerticalAlignment="Bottom" Height="40" HorizontalAlignment="Left" Width="164"/>
+        <Button Content="{ul:Tr Hallo, Uid=510}" Margin="10,0,0,29" Command="{Binding ShowMessageCommand}" VerticalAlignment="Bottom" Height="30" HorizontalAlignment="Left" Width="143"/>
     </Grid>
 </Window>

Localization.Demo/ViewModel/MainWindowViewModel.cs

@@ -12,40 +12,41 @@ internal class MainWindowViewModel : INotifyPropertyChanged
 
         public MainWindowViewModel()
         {
-            var a = LocalizationService.RegisteredPacks;
+            var a = LanguageService.RegisteredPacks;
             var cultures = a.Keys;
             foreach (var culture in cultures)
             {
-                var pack = BaseLanguagePack.GetResources(culture);
+                var pack = LanguageItem.GetResources(culture);
                 Cultures.Add(pack);
                 CultureMenus.Add(new MenuItem() { Header= $"{pack.EnglishName} ({pack.CultureName})", Tag = pack });
             }
         }
 
-        private RelayCommand<BaseLanguagePack> _changeLanguageCommand;
-        public RelayCommand<BaseLanguagePack> ChangeLanguageCommand => _changeLanguageCommand ?? (_changeLanguageCommand = new RelayCommand<BaseLanguagePack>(ChangeLanguage));
+        private RelayCommand<LanguageItem> _changeLanguageCommand;
+        public RelayCommand<LanguageItem> ChangeLanguageCommand => _changeLanguageCommand ?? (_changeLanguageCommand = new RelayCommand<LanguageItem>(ChangeLanguage));
+        
         private RelayCommand _showMessageCommand;
         public RelayCommand ShowMessageCommand => _showMessageCommand ?? (_showMessageCommand = new RelayCommand(ShowMessage));
 
         private void ShowMessage(object obj)
         {
-            MessageBox.Show(LocalizationService.GetString("511", "Text", "Message"),LocalizationService.GetString("511", "Header","Header"));
+            MessageBox.Show(Application.Current.MainWindow,"511,Text".Localize() ,LanguageService.GetString("511", "Header","Header"));
         }
 
-        private void ChangeLanguage(BaseLanguagePack value)
+        private void ChangeLanguage(LanguageItem value)
         {
             if (value != null)
             {
-                LocalizationService.Current.ChangeLanguage(value);
+                LanguageService.Current.ChangeLanguage(value);
                 OnPropertyChanged(nameof(SelectedPack));
             }
         }
 
-        private ObservableCollection<BaseLanguagePack> _cultures = new ObservableCollection<BaseLanguagePack>();
-        private BaseLanguagePack _selectedPack;
+        private ObservableCollection<LanguageItem> _cultures = new ObservableCollection<LanguageItem>();
+        private LanguageItem _selectedPack;
         private ObservableCollection<MenuItem> _cultureMenus = new ObservableCollection<MenuItem>();
 
-        public ObservableCollection<BaseLanguagePack> Cultures
+        public ObservableCollection<LanguageItem> Cultures
         {
             get => _cultures; set
             {
@@ -63,13 +64,13 @@ public ObservableCollection<MenuItem> CultureMenus
         }
         public int LanguageCount => Cultures.Count;
 
-        public BaseLanguagePack SelectedPack
+        public LanguageItem SelectedPack
         {
             get => _selectedPack;
             set
             {
                 _selectedPack = value;
-                LocalizationService.Current.ChangeLanguage(value);
+                LanguageService.Current.ChangeLanguage(value);
                 OnPropertyChanged(nameof(SelectedPack));
             }
         }

Localization.Demo/ViewModel/RelayCommand.cs

@@ -30,8 +30,7 @@ public void Execute(object parameter)
             _execute(parameter);
         }
 
-        // Ensures WPF commanding infrastructure asks all RelayCommand objects whether their
-        // associated views should be enabled whenever a command is invoked 
+
         public event EventHandler CanExecuteChanged
         {
             add