Skip to content

Translations #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 7, 2020
Merged

Translations #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da85340
Added strings for recent items
Feb 6, 2020
2eaf2bd
Added strings for Properties.xaml
Feb 6, 2020
06a403d
Added swipe gesture for navigation
Feb 7, 2020
fb20eed
Added strings for About.xaml
Feb 7, 2020
a204773
Added strings for Appearance.xaml
Feb 7, 2020
13ded4b
Added strings for FilesAndFolders.xaml
Feb 7, 2020
0024857
Added strings for OnStartup.xaml
Feb 7, 2020
050fc5f
Added strings for Preferences.xaml
Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Files/Files.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@
<PropertyGroup>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<PropertyGroup Label="MultilingualAppToolkit">
<MultilingualAppToolkitVersion>4.0</MultilingualAppToolkitVersion>
<MultilingualFallbackLanguage>en-US</MultilingualFallbackLanguage>
<TranslationReport Condition="'$(Configuration)' == 'Release'">true</TranslationReport>
<SuppressPseudoWarning Condition="'$(Configuration)' == 'Debug'">true</SuppressPseudoWarning>
</PropertyGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
Expand Down Expand Up @@ -269,6 +275,7 @@
<Content Include="Assets\WSL\ubuntu.svg" />
<Content Include="Assets\WSL\ubuntupng.png" />
<Content Include="Properties\Default.rd.xml" />
<PRIResource Include="Strings\en-US\Resources.resw" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
Expand Down Expand Up @@ -432,6 +439,10 @@
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<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')" />
<Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" Label="MultilingualAppToolkit">
<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." />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
63 changes: 58 additions & 5 deletions Files/ProHome.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,11 +520,36 @@
</DataTemplate>
</muxc:NavigationView.MenuItemTemplate>
</muxc:NavigationView>
<TextBlock Visibility="Visible" Margin="8,-16,0,0" Text="Drives" FontSize="14" FontWeight="SemiBold" Padding="0" VerticalAlignment="Stretch"/>
<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">
<TextBlock
Margin="8,-16,0,0"
Padding="0"
VerticalAlignment="Stretch"
FontSize="14"
FontWeight="SemiBold"
Text="Drives"
Visibility="Visible" />
<muxc:NavigationView
x:Name="DrivesList"
Padding="0"
x:FieldModifier="public"
IsBackButtonVisible="Collapsed"
IsPaneOpen="True"
IsPaneToggleButtonVisible="False"
IsSettingsVisible="False"
IsTitleBarAutoPaddingEnabled="False"
ItemInvoked="DrivesList_ItemInvoked"
MenuItemsSource="{x:Bind local:App.AppSettings.DrivesManager.Drives}"
OpenPaneLength="225"
PaneDisplayMode="Left"
PaneTitle="Drives"
SelectionChanged="DrivesList_SelectionChanged"
Style="{StaticResource NavigationViewStyle_Fixed}">
<muxc:NavigationView.MenuItemTemplate>
<DataTemplate x:DataType="local2:DriveItem">
<muxc:NavigationViewItem Padding="0" Tag="{x:Bind tag}" Visibility="{x:Bind itemVisibility}">
<muxc:NavigationViewItem
Padding="0"
Tag="{x:Bind tag}"
Visibility="{x:Bind itemVisibility}">
<muxc:NavigationViewItem.Content>
<StackPanel
Margin="-4,0,0,0"
Expand All @@ -551,8 +576,33 @@
</DataTemplate>
</muxc:NavigationView.MenuItemTemplate>
</muxc:NavigationView>
<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"/>
<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">
<TextBlock
x:Name="LinuxHeader"
Margin="8,-16,0,0"
Padding="0"
VerticalAlignment="Stretch"
x:Load="{x:Bind local:App.AppSettings.AreLinuxFilesSupported, Mode=OneWay}"
FontSize="14"
FontWeight="SemiBold"
Text="Linux Files"
Visibility="Visible" />
<muxc:NavigationView
x:Name="LinuxList"
Padding="0"
x:FieldModifier="public"
x:Load="{x:Bind local:App.AppSettings.AreLinuxFilesSupported, Mode=OneWay}"
IsBackButtonVisible="Collapsed"
IsPaneOpen="True"
IsPaneToggleButtonVisible="False"
IsSettingsVisible="False"
IsTitleBarAutoPaddingEnabled="False"
ItemInvoked="LinuxList_ItemInvoked"
MenuItemsSource="{x:Bind local:App.linuxDistroItems, Mode=OneWay}"
OpenPaneLength="225"
PaneDisplayMode="Left"
PaneTitle="Linux Files"
SelectionChanged="LinuxList_SelectionChanged"
Style="{StaticResource NavigationViewStyle_Fixed}">
<muxc:NavigationView.MenuItemTemplate>
<DataTemplate x:DataType="local:WSLDistroItem">
<muxc:NavigationViewItem Padding="0" Tag="{x:Bind Path}">
Expand Down Expand Up @@ -586,6 +636,9 @@
x:Name="ItemDisplayFrame"
x:FieldModifier="public"
Background="{StaticResource ApplicationPageBackgroundThemeBrush}"
ManipulationCompleted="SwipeablePage_ManipulationCompleted"
ManipulationDelta="SwipeablePage_ManipulationDelta"
ManipulationMode="TranslateX,TranslateInertia,System"
Navigated="ItemDisplayFrame_Navigated" />

</SplitView>
Expand Down
24 changes: 24 additions & 0 deletions Files/ProHome.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,31 @@ public ItemViewModel instanceViewModel
Bindings.Update();
}
}
private bool _isSwiped;
private void SwipeablePage_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
{
if (e.IsInertial && !_isSwiped)
{
var swipedDistance = e.Cumulative.Translation.X;

if (Math.Abs(swipedDistance) <= 2) return;

if (swipedDistance > 0)
{
NavigationActions.Back_Click(null, null);
}
else
{
NavigationActions.Forward_Click(null, null);
}
_isSwiped = true;
}
}

private void SwipeablePage_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
{
_isSwiped = false;
}
public ProHome()
{
this.InitializeComponent();
Expand Down
11 changes: 6 additions & 5 deletions Files/Properties.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
</Custom:DockPanel>
<TextBox
x:Name="itemFileName"
x:Uid="PropertiesItemFileName"
Grid.Column="1"
Margin="15,0,15,0"
Padding="10,4"
Expand All @@ -65,7 +66,7 @@
<ColumnDefinition Width="90" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Item type:" />
<TextBlock x:Uid="PropertiesItemType" Text="Item type:" />
<TextBlock
x:Name="itemType"
Grid.Column="1"
Expand All @@ -77,7 +78,7 @@
<ColumnDefinition Width="90" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Path:" />
<TextBlock x:Uid="PropertiesItemPath" Text="Path:" />
<TextBlock
x:Name="itemPath"
Grid.Column="2"
Expand All @@ -90,7 +91,7 @@
<ColumnDefinition Width="90" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Size:" />
<TextBlock x:Uid="PropertiesItemSize" Text="Size:" />
<TextBlock
x:Name="itemSize"
Grid.Column="3"
Expand All @@ -103,7 +104,7 @@
<ColumnDefinition Width="90" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Created:" />
<TextBlock x:Uid="PropertiesCreated" Text="Created:" />
<TextBlock
x:Name="itemCreatedTimestamp"
Grid.Column="4"
Expand All @@ -115,7 +116,7 @@
<ColumnDefinition Width="90" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="Modified:" />
<TextBlock x:Uid="PropertiesModified" Text="Modified:" />
<TextBlock
x:Name="itemModifiedTimestamp"
Grid.Column="5"
Expand Down
23 changes: 17 additions & 6 deletions Files/Settings.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Grid>
<muxc:NavigationView
x:Name="SettingsPane"
x:Uid="SettingsNav"
Margin="0,8,0,0"
IsBackButtonVisible="Collapsed"
IsPaneToggleButtonVisible="True"
Expand All @@ -22,39 +23,49 @@
PaneTitle="Settings">
<muxc:NavigationView.AutoSuggestBox>
<AutoSuggestBox
x:Uid="SettingsNavSearch"
MinWidth="150"
AutomationProperties.Name="Search"
PlaceholderText="Search"
QueryIcon="Find" />
</muxc:NavigationView.AutoSuggestBox>

<muxc:NavigationView.MenuItems>
<muxc:NavigationViewItem Content="Appearance" IsSelected="True">
<muxc:NavigationViewItem
x:Uid="SettingsNavAppearance"
Content="Appearance"
IsSelected="True">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE790;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="On Startup" IsSelected="True">
<muxc:NavigationViewItem
x:Uid="SettingsNavOnStartup"
Content="On Startup"
IsSelected="True">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE7E8;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="Page Layouts" Visibility="Collapsed">
<muxc:NavigationViewItem
x:Uid="SettingsNavPageLayouts"
Content="Page Layouts"
Visibility="Collapsed">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE737;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="Preferences">
<muxc:NavigationViewItem x:Uid="SettingsNavPreferences" Content="Preferences">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE713;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="Files and Folders">
<muxc:NavigationViewItem x:Uid="SettingsNavFilesAndFolders" Content="Files and Folders">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xEC50;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="About">
<muxc:NavigationViewItem x:Uid="SettingsNavAbout" Content="About">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE946;" />
</muxc:NavigationViewItem.Icon>
Expand Down
29 changes: 18 additions & 11 deletions Files/SettingsPages/About.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,21 @@
</TransitionCollection>
</StackPanel.ChildrenTransitions>

<TextBlock FontSize="22" Text="About" />
<TextBlock
x:Uid="SettingsAboutTitle"
FontSize="22"
Text="About" />

<StackPanel Orientation="Horizontal">
<Image
Width="60"
Source="/Assets/Files UWP Beta Icon.png"
Stretch="Uniform" />
<StackPanel Padding="12,0,0,0" Orientation="Vertical">
<TextBlock FontSize="16" Text="Files UWP" />
<TextBlock
x:Uid="SettingsAboutAppName"
FontSize="16"
Text="Files UWP" />
<TextBlock
x:Name="VersionNumber"
Padding="0,4"
Expand All @@ -57,8 +63,9 @@
Spacing="14">
<FontIcon Glyph="&#xED15;" />
<StackPanel VerticalAlignment="Center" Orientation="Vertical">
<TextBlock Text="Submit Feedback" />
<TextBlock x:Uid="SettingsAboutSubmitFeedback" Text="Submit Feedback" />
<TextBlock
x:Uid="SettingsAboutSubmitFeedbackDescription"
Foreground="Gray"
Text="Submit an issue report to provide the developers with information"
TextWrapping="Wrap" />
Expand All @@ -68,13 +75,17 @@
</ListView>

<StackPanel Spacing="4">
<TextBlock FontSize="16" Text="Special thanks to:" />
<TextBlock
x:Uid="SettingsAboutSpecialThanks"
FontSize="16"
Text="Special thanks to:" />
<TextBlock Text="SOI7" />
<TextBlock Text="jeffsieu" />
<TextBlock Text="yaichenbaum" />
</StackPanel>

<TextBlock
x:Uid="SettingsAboutThirdPartyLicenses"
Margin="0,16,0,0"
FontSize="18"
Text="Third Party Licenses">
Expand All @@ -87,23 +98,19 @@
</TextBlock>

<StackPanel Orientation="Horizontal">
<BitmapIcon
Width="16"
VerticalAlignment="Center"
UriSource="ms-appx:///Assets/QuickLook/quicklook_icon_black.png" />
<TextBlock
Margin="2,0,16,0"
Margin="0,0,16,0"
VerticalAlignment="Bottom"
FontSize="16"
Text="QuickLook" />
<TextBlock
Margin="0,0,8,0"
VerticalAlignment="Bottom"
TextWrapping="WrapWholeWords">
<Span xml:space="preserve"><Run>Website: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook">Link</Hyperlink></Span>
<Span xml:space="preserve"><Run x:Uid="SettingsAboutWebsite">Website: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook">Link</Hyperlink></Span>
</TextBlock>
<TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords">
<Span xml:space="preserve"><Run>License: </Run><Hyperlink NavigateUri="https://github.com/QL-Win/QuickLook/blob/master/LICENSE-GPL.txt">Link</Hyperlink></Span>
<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>
</TextBlock>
</StackPanel>
</StackPanel>
Expand Down
Loading