Skip to content

Commit ead0902

Browse files
yaira2yaira2
authored
Translations (#397)
* Added strings for recent items * Added strings for Properties.xaml * Added strings for Settings.xaml * Added swipe gesture for navigation * Added strings for About.xaml * Added strings for Appearance.xaml * Added strings for FilesAndFolders.xaml * Added strings for OnStartup.xaml * Added strings for Preferences.xaml
1 parent c66defd commit ead0902

File tree

12 files changed

+489
-44
lines changed

12 files changed

+489
-44
lines changed

‎Files/Files.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,12 @@
131131
<PropertyGroup>
132132
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
133133
</PropertyGroup>
134+
<PropertyGroup Label="MultilingualAppToolkit">
135+
<MultilingualAppToolkitVersion>4.0</MultilingualAppToolkitVersion>
136+
<MultilingualFallbackLanguage>en-US</MultilingualFallbackLanguage>
137+
<TranslationReport Condition="'$(Configuration)' == 'Release'">true</TranslationReport>
138+
<SuppressPseudoWarning Condition="'$(Configuration)' == 'Debug'">true</SuppressPseudoWarning>
139+
</PropertyGroup>
134140
<ItemGroup>
135141
<Compile Include="App.xaml.cs">
136142
<DependentUpon>App.xaml</DependentUpon>
@@ -269,6 +275,7 @@
269275
<Content Include="Assets\WSL\ubuntu.svg" />
270276
<Content Include="Assets\WSL\ubuntupng.png" />
271277
<Content Include="Properties\Default.rd.xml" />
278+
<PRIResource Include="Strings\en-US\Resources.resw" />
272279
</ItemGroup>
273280
<ItemGroup>
274281
<ApplicationDefinition Include="App.xaml">
@@ -432,6 +439,10 @@
432439
<VisualStudioVersion>14.0</VisualStudioVersion>
433440
</PropertyGroup>
434441
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
442+
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets" Label="MultilingualAppToolkit" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\v$(MultilingualAppToolkitVersion)\Microsoft.Multilingual.PriResources.targets')" />
443+
<Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" Label="MultilingualAppToolkit">
444+
<Warning Text="$(MSBuildProjectFile) is Multilingual build enabled, but the Multilingual App Toolkit is unavailable during the build. If building with Visual Studio, please check to ensure that toolkit is properly installed." />
445+
</Target>
435446
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
436447
Other similar extension points exist, see Microsoft.Common.targets.
437448
<Target Name="BeforeBuild">

‎Files/ProHome.xaml

Lines changed: 58 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -520,11 +520,36 @@
520520
</DataTemplate>
521521
</muxc:NavigationView.MenuItemTemplate>
522522
</muxc:NavigationView>
523-
<TextBlock Visibility="Visible" Margin="8,-16,0,0" Text="Drives" FontSize="14" FontWeight="SemiBold" Padding="0" VerticalAlignment="Stretch"/>
524-
<muxc:NavigationView Style="{StaticResource NavigationViewStyle_Fixed}" PaneTitle="Drives" OpenPaneLength="225" Padding="0" IsTitleBarAutoPaddingEnabled="False" PaneDisplayMode="Left" ItemInvoked="DrivesList_ItemInvoked" x:FieldModifier="public" IsPaneOpen="True" IsSettingsVisible="False" IsPaneToggleButtonVisible="False" IsBackButtonVisible="Collapsed" MenuItemsSource="{x:Bind local:App.AppSettings.DrivesManager.Drives}" SelectionChanged="DrivesList_SelectionChanged" x:Name="DrivesList">
523+
<TextBlock
524+
Margin="8,-16,0,0"
525+
Padding="0"
526+
VerticalAlignment="Stretch"
527+
FontSize="14"
528+
FontWeight="SemiBold"
529+
Text="Drives"
530+
Visibility="Visible" />
531+
<muxc:NavigationView
532+
x:Name="DrivesList"
533+
Padding="0"
534+
x:FieldModifier="public"
535+
IsBackButtonVisible="Collapsed"
536+
IsPaneOpen="True"
537+
IsPaneToggleButtonVisible="False"
538+
IsSettingsVisible="False"
539+
IsTitleBarAutoPaddingEnabled="False"
540+
ItemInvoked="DrivesList_ItemInvoked"
541+
MenuItemsSource="{x:Bind local:App.AppSettings.DrivesManager.Drives}"
542+
OpenPaneLength="225"
543+
PaneDisplayMode="Left"
544+
PaneTitle="Drives"
545+
SelectionChanged="DrivesList_SelectionChanged"
546+
Style="{StaticResource NavigationViewStyle_Fixed}">
525547
<muxc:NavigationView.MenuItemTemplate>
526548
<DataTemplate x:DataType="local2:DriveItem">
527-
<muxc:NavigationViewItem Padding="0" Tag="{x:Bind tag}" Visibility="{x:Bind itemVisibility}">
549+
<muxc:NavigationViewItem
550+
Padding="0"
551+
Tag="{x:Bind tag}"
552+
Visibility="{x:Bind itemVisibility}">
528553
<muxc:NavigationViewItem.Content>
529554
<StackPanel
530555
Margin="-4,0,0,0"
@@ -551,8 +576,33 @@
551576
</DataTemplate>
552577
</muxc:NavigationView.MenuItemTemplate>
553578
</muxc:NavigationView>
554-
<TextBlock x:Name="LinuxHeader" x:Load="{x:Bind local:App.AppSettings.AreLinuxFilesSupported, Mode=OneWay}" Visibility="Visible" Margin="8,-16,0,0" Text="Linux Files" FontSize="14" FontWeight="SemiBold" Padding="0" VerticalAlignment="Stretch"/>
555-
<muxc:NavigationView Style="{StaticResource NavigationViewStyle_Fixed}" PaneTitle="Linux Files" x:Load="{x:Bind local:App.AppSettings.AreLinuxFilesSupported, Mode=OneWay}" OpenPaneLength="225" Padding="0" IsTitleBarAutoPaddingEnabled="False" PaneDisplayMode="Left" ItemInvoked="LinuxList_ItemInvoked" x:FieldModifier="public" IsPaneOpen="True" IsSettingsVisible="False" IsPaneToggleButtonVisible="False" IsBackButtonVisible="Collapsed" MenuItemsSource="{x:Bind local:App.linuxDistroItems, Mode=OneWay}" SelectionChanged="LinuxList_SelectionChanged" x:Name="LinuxList">
579+
<TextBlock
580+
x:Name="LinuxHeader"
581+
Margin="8,-16,0,0"
582+
Padding="0"
583+
VerticalAlignment="Stretch"
584+
x:Load="{x:Bind local:App.AppSettings.AreLinuxFilesSupported, Mode=OneWay}"
585+
FontSize="14"
586+
FontWeight="SemiBold"
587+
Text="Linux Files"
588+
Visibility="Visible" />
589+
<muxc:NavigationView
590+
x:Name="LinuxList"
591+
Padding="0"
592+
x:FieldModifier="public"
593+
x:Load="{x:Bind local:App.AppSettings.AreLinuxFilesSupported, Mode=OneWay}"
594+
IsBackButtonVisible="Collapsed"
595+
IsPaneOpen="True"
596+
IsPaneToggleButtonVisible="False"
597+
IsSettingsVisible="False"
598+
IsTitleBarAutoPaddingEnabled="False"
599+
ItemInvoked="LinuxList_ItemInvoked"
600+
MenuItemsSource="{x:Bind local:App.linuxDistroItems, Mode=OneWay}"
601+
OpenPaneLength="225"
602+
PaneDisplayMode="Left"
603+
PaneTitle="Linux Files"
604+
SelectionChanged="LinuxList_SelectionChanged"
605+
Style="{StaticResource NavigationViewStyle_Fixed}">
556606
<muxc:NavigationView.MenuItemTemplate>
557607
<DataTemplate x:DataType="local:WSLDistroItem">
558608
<muxc:NavigationViewItem Padding="0" Tag="{x:Bind Path}">
@@ -586,6 +636,9 @@
586636
x:Name="ItemDisplayFrame"
587637
x:FieldModifier="public"
588638
Background="{StaticResource ApplicationPageBackgroundThemeBrush}"
639+
ManipulationCompleted="SwipeablePage_ManipulationCompleted"
640+
ManipulationDelta="SwipeablePage_ManipulationDelta"
641+
ManipulationMode="TranslateX,TranslateInertia,System"
589642
Navigated="ItemDisplayFrame_Navigated" />
590643

591644
</SplitView>

‎Files/ProHome.xaml.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,31 @@ public ItemViewModel instanceViewModel
5050
Bindings.Update();
5151
}
5252
}
53+
private bool _isSwiped;
54+
private void SwipeablePage_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
55+
{
56+
if (e.IsInertial && !_isSwiped)
57+
{
58+
var swipedDistance = e.Cumulative.Translation.X;
59+
60+
if (Math.Abs(swipedDistance) <= 2) return;
61+
62+
if (swipedDistance > 0)
63+
{
64+
NavigationActions.Back_Click(null, null);
65+
}
66+
else
67+
{
68+
NavigationActions.Forward_Click(null, null);
69+
}
70+
_isSwiped = true;
71+
}
72+
}
5373

74+
private void SwipeablePage_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
75+
{
76+
_isSwiped = false;
77+
}
5478
public ProHome()
5579
{
5680
this.InitializeComponent();

‎Files/Properties.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
</Custom:DockPanel>
5050
<TextBox
5151
x:Name="itemFileName"
52+
x:Uid="PropertiesItemFileName"
5253
Grid.Column="1"
5354
Margin="15,0,15,0"
5455
Padding="10,4"
@@ -65,7 +66,7 @@
6566
<ColumnDefinition Width="90" />
6667
<ColumnDefinition Width="*" />
6768
</Grid.ColumnDefinitions>
68-
<TextBlock Text="Item type:" />
69+
<TextBlock x:Uid="PropertiesItemType" Text="Item type:" />
6970
<TextBlock
7071
x:Name="itemType"
7172
Grid.Column="1"
@@ -77,7 +78,7 @@
7778
<ColumnDefinition Width="90" />
7879
<ColumnDefinition Width="*" />
7980
</Grid.ColumnDefinitions>
80-
<TextBlock Text="Path:" />
81+
<TextBlock x:Uid="PropertiesItemPath" Text="Path:" />
8182
<TextBlock
8283
x:Name="itemPath"
8384
Grid.Column="2"
@@ -90,7 +91,7 @@
9091
<ColumnDefinition Width="90" />
9192
<ColumnDefinition Width="*" />
9293
</Grid.ColumnDefinitions>
93-
<TextBlock Text="Size:" />
94+
<TextBlock x:Uid="PropertiesItemSize" Text="Size:" />
9495
<TextBlock
9596
x:Name="itemSize"
9697
Grid.Column="3"
@@ -103,7 +104,7 @@
103104
<ColumnDefinition Width="90" />
104105
<ColumnDefinition Width="*" />
105106
</Grid.ColumnDefinitions>
106-
<TextBlock Text="Created:" />
107+
<TextBlock x:Uid="PropertiesCreated" Text="Created:" />
107108
<TextBlock
108109
x:Name="itemCreatedTimestamp"
109110
Grid.Column="4"
@@ -115,7 +116,7 @@
115116
<ColumnDefinition Width="90" />
116117
<ColumnDefinition Width="*" />
117118
</Grid.ColumnDefinitions>
118-
<TextBlock Text="Modified:" />
119+
<TextBlock x:Uid="PropertiesModified" Text="Modified:" />
119120
<TextBlock
120121
x:Name="itemModifiedTimestamp"
121122
Grid.Column="5"

‎Files/Settings.xaml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<Grid>
1313
<muxc:NavigationView
1414
x:Name="SettingsPane"
15+
x:Uid="SettingsNav"
1516
Margin="0,8,0,0"
1617
IsBackButtonVisible="Collapsed"
1718
IsPaneToggleButtonVisible="True"
@@ -22,39 +23,49 @@
2223
PaneTitle="Settings">
2324
<muxc:NavigationView.AutoSuggestBox>
2425
<AutoSuggestBox
26+
x:Uid="SettingsNavSearch"
2527
MinWidth="150"
2628
AutomationProperties.Name="Search"
2729
PlaceholderText="Search"
2830
QueryIcon="Find" />
2931
</muxc:NavigationView.AutoSuggestBox>
3032

3133
<muxc:NavigationView.MenuItems>
32-
<muxc:NavigationViewItem Content="Appearance" IsSelected="True">
34+
<muxc:NavigationViewItem
35+
x:Uid="SettingsNavAppearance"
36+
Content="Appearance"
37+
IsSelected="True">
3338
<muxc:NavigationViewItem.Icon>
3439
<FontIcon Glyph="&#xE790;" />
3540
</muxc:NavigationViewItem.Icon>
3641
</muxc:NavigationViewItem>
37-
<muxc:NavigationViewItem Content="On Startup" IsSelected="True">
42+
<muxc:NavigationViewItem
43+
x:Uid="SettingsNavOnStartup"
44+
Content="On Startup"
45+
IsSelected="True">
3846
<muxc:NavigationViewItem.Icon>
3947
<FontIcon Glyph="&#xE7E8;" />
4048
</muxc:NavigationViewItem.Icon>
4149
</muxc:NavigationViewItem>
42-
<muxc:NavigationViewItem Content="Page Layouts" Visibility="Collapsed">
50+
<muxc:NavigationViewItem
51+
x:Uid="SettingsNavPageLayouts"
52+
Content="Page Layouts"
53+
Visibility="Collapsed">
4354
<muxc:NavigationViewItem.Icon>
4455
<FontIcon Glyph="&#xE737;" />
4556
</muxc:NavigationViewItem.Icon>
4657
</muxc:NavigationViewItem>
47-
<muxc:NavigationViewItem Content="Preferences">
58+
<muxc:NavigationViewItem x:Uid="SettingsNavPreferences" Content="Preferences">
4859
<muxc:NavigationViewItem.Icon>
4960
<FontIcon Glyph="&#xE713;" />
5061
</muxc:NavigationViewItem.Icon>
5162
</muxc:NavigationViewItem>
52-
<muxc:NavigationViewItem Content="Files and Folders">
63+
<muxc:NavigationViewItem x:Uid="SettingsNavFilesAndFolders" Content="Files and Folders">
5364
<muxc:NavigationViewItem.Icon>
5465
<FontIcon Glyph="&#xEC50;" />
5566
</muxc:NavigationViewItem.Icon>
5667
</muxc:NavigationViewItem>
57-
<muxc:NavigationViewItem Content="About">
68+
<muxc:NavigationViewItem x:Uid="SettingsNavAbout" Content="About">
5869
<muxc:NavigationViewItem.Icon>
5970
<FontIcon Glyph="&#xE946;" />
6071
</muxc:NavigationViewItem.Icon>

‎Files/SettingsPages/About.xaml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,21 @@
2424
</TransitionCollection>
2525
</StackPanel.ChildrenTransitions>
2626

27-
<TextBlock FontSize="22" Text="About" />
27+
<TextBlock
28+
x:Uid="SettingsAboutTitle"
29+
FontSize="22"
30+
Text="About" />
2831

2932
<StackPanel Orientation="Horizontal">
3033
<Image
3134
Width="60"
3235
Source="/Assets/Files UWP Beta Icon.png"
3336
Stretch="Uniform" />
3437
<StackPanel Padding="12,0,0,0" Orientation="Vertical">
35-
<TextBlock FontSize="16" Text="Files UWP" />
38+
<TextBlock
39+
x:Uid="SettingsAboutAppName"
40+
FontSize="16"
41+
Text="Files UWP" />
3642
<TextBlock
3743
x:Name="VersionNumber"
3844
Padding="0,4"
@@ -57,8 +63,9 @@
5763
Spacing="14">
5864
<FontIcon Glyph="&#xED15;" />
5965
<StackPanel VerticalAlignment="Center" Orientation="Vertical">
60-
<TextBlock Text="Submit Feedback" />
66+
<TextBlock x:Uid="SettingsAboutSubmitFeedback" Text="Submit Feedback" />
6167
<TextBlock
68+
x:Uid="SettingsAboutSubmitFeedbackDescription"
6269
Foreground="Gray"
6370
Text="Submit an issue report to provide the developers with information"
6471
TextWrapping="Wrap" />
@@ -68,13 +75,17 @@
6875
</ListView>
6976

7077
<StackPanel Spacing="4">
71-
<TextBlock FontSize="16" Text="Special thanks to:" />
78+
<TextBlock
79+
x:Uid="SettingsAboutSpecialThanks"
80+
FontSize="16"
81+
Text="Special thanks to:" />
7282
<TextBlock Text="SOI7" />
7383
<TextBlock Text="jeffsieu" />
7484
<TextBlock Text="yaichenbaum" />
7585
</StackPanel>
7686

7787
<TextBlock
88+
x:Uid="SettingsAboutThirdPartyLicenses"
7889
Margin="0,16,0,0"
7990
FontSize="18"
8091
Text="Third Party Licenses">
@@ -87,23 +98,19 @@
8798
</TextBlock>
8899

89100
<StackPanel Orientation="Horizontal">
90-
<BitmapIcon
91-
Width="16"
92-
VerticalAlignment="Center"
93-
UriSource="ms-appx:///Assets/QuickLook/quicklook_icon_black.png" />
94101
<TextBlock
95-
Margin="2,0,16,0"
102+
Margin="0,0,16,0"
96103
VerticalAlignment="Bottom"
97104
FontSize="16"
98105
Text="QuickLook" />
99106
<TextBlock
100107
Margin="0,0,8,0"
101108
VerticalAlignment="Bottom"
102109
TextWrapping="WrapWholeWords">
103-
<Span xml:space="preserve"><Run>Website: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook">Link</Hyperlink></Span>
110+
<Span xml:space="preserve"><Run x:Uid="SettingsAboutWebsite">Website: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook">Link</Hyperlink></Span>
104111
</TextBlock>
105112
<TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords">
106-
<Span xml:space="preserve"><Run>License: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook/blob/master/LICENSE-GPL.txt">Link</Hyperlink></Span>
113+
<Span xml:space="preserve"><Run x:Uid="SettingsAboutLicense">License: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook/blob/master/LICENSE-GPL.txt">Link</Hyperlink></Span>
107114
</TextBlock>
108115
</StackPanel>
109116
</StackPanel>

0 commit comments

Comments
 (0)