Archived
1
0

Localization development 3

This commit is contained in:
Michael Gordeev
2018-08-21 22:36:41 +03:00
parent 6992a308b1
commit 33da627445
16 changed files with 228 additions and 195 deletions
+19 -24
View File
@@ -15,19 +15,19 @@
<NavigationView SelectedItem="toHome" BackRequested="nav_BackRequested" PaneTitle="FoxTube" OpenPaneLength="300" Name="nav" IsPaneOpen="False" SelectionChanged="nav_SelectionChanged">
<NavigationView.MenuItems>
<NavigationViewItem x:Uid="home" Icon="Home" Content="Home" Name="toHome"/>
<NavigationViewItem x:Uid="myChannel" Icon="Contact" Content="My channel" Name="toChannel" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="subscriptions" Icon="People" Content="Subscriptions" Name="toSubscriptions" Visibility="Collapsed"/>
<NavigationViewItemHeader x:Uid="myLibrary" Content="My library" Name="libHeader" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="history" Content="History" Name="toHistory" Visibility="Collapsed">
<NavigationViewItem x:Uid="/Main/home" Icon="Home" Content="Home" Name="toHome"/>
<NavigationViewItem x:Uid="/Main/myChannel" Icon="Contact" Content="My channel" Name="toChannel" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="/Main/subscriptions" Icon="People" Content="Subscriptions" Name="toSubscriptions" Visibility="Collapsed"/>
<NavigationViewItemHeader x:Uid="/Main/myLibrary" Content="My library" Name="libHeader" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="/Main/history" Content="History" Name="toHistory" Visibility="Collapsed">
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xE81C;"/>
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItem x:Uid="liked" Icon="Like" Content="Liked videos" Name="toLiked" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="later" Icon="Clock" Content="Watch later" Name="toLater" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="downloads" Icon="Download" Content="Downloads" Name="toDownloads" Visibility="Collapsed"/>
<NavigationViewItemHeader x:Uid="subscriptions" Content="Subscriptions" Name="subsHeader" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="/Main/liked" Icon="Like" Content="Liked videos" Name="toLiked" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="/Main/later" Icon="Clock" Content="Watch later" Name="toLater" Visibility="Collapsed"/>
<NavigationViewItem x:Uid="/Main/downloads" Icon="Download" Content="Downloads" Name="toDownloads" Visibility="Collapsed"/>
<NavigationViewItemHeader x:Uid="/Main/subscriptions" Content="Subscriptions" Name="subsHeader" Visibility="Collapsed"/>
</NavigationView.MenuItems>
<NavigationView.PaneFooter>
@@ -35,22 +35,20 @@
<Button Visibility="Visible" Name="feedback" Click="feedback_Click" Height="40" HorizontalAlignment="Stretch" Background="Transparent" HorizontalContentAlignment="Left">
<StackPanel Orientation="Horizontal">
<FontIcon Glyph="&#xED15;" FontSize="16" Margin="6,0,16,0"/>
<TextBlock x:Uid="feedback" Text="Give a feedback"/>
<TextBlock x:Uid="/Main/feedback" Text="Give a feedback"/>
</StackPanel>
</Button>
<Button Visibility="Collapsed" Name="removeAds" Height="40" HorizontalAlignment="Stretch" Background="Transparent" HorizontalContentAlignment="Left">
<StackPanel Orientation="Horizontal">
<FontIcon Glyph="&#xE14D;" FontSize="16" Margin="6,0,16,0"/>
<TextBlock x:Uid="adsFree" Text="Remove ads"/>
<TextBlock x:Uid="/Main/adsFree" Text="Remove ads"/>
</StackPanel>
</Button>
</StackPanel>
</NavigationView.PaneFooter>
<NavigationView.AutoSuggestBox>
<AutoSuggestBox x:Name="search" QueryIcon="Find" QuerySubmitted="search_QuerySubmitted" TextChanged="search_TextChanged">
<AutoSuggestBox.PlaceholderText x:Uid="searchPlaceholder">Search</AutoSuggestBox.PlaceholderText>
</AutoSuggestBox>
<AutoSuggestBox x:Name="search" QueryIcon="Find" QuerySubmitted="search_QuerySubmitted" TextChanged="search_TextChanged" x:Uid="/Main/searchPlaceholder" PlaceholderText="Search"/>
</NavigationView.AutoSuggestBox>
<NavigationView.Header>
@@ -63,8 +61,7 @@
<StackPanel Orientation="Horizontal" Grid.Column="1" Margin="10,25,0,-11">
<Button Name="notificationMenu" Click="notificationMenu_Click"
FontFamily="Segoe MDL2 Assets" Content="&#xED0D;"
Width="50" Height="50" Background="Transparent">
<ToolTipService.ToolTip x:Uid="notifications">Notifications</ToolTipService.ToolTip>
Width="50" Height="50" Background="Transparent" x:Uid="notifications" ToolTipService.ToolTip="Notifications">
<Button.Flyout>
<Flyout Content="{x:Bind notificationsCenter}"/>
</Button.Flyout>
@@ -72,24 +69,22 @@
<Button Name="account"
FontFamily="Segoe MDL2 Assets" Content="&#xE8FA;"
Width="50" Height="50" Background="Transparent">
<ToolTipService.ToolTip x:Uid="signIn">Sign in</ToolTipService.ToolTip>
Width="50" Height="50" Background="Transparent" x:Uid="signIn" ToolTipService.ToolTip="Sign in">
<Button.Flyout>
<MenuFlyout>
<MenuFlyoutItem x:Uid="signEx" Text="Sign in with existing account" Name="signIn" Click="signIn_Click"/>
<MenuFlyoutItem x:Uid="signNew" Text="Create new Google account" Name="createAccount" Click="createAccount_Click"/>
<MenuFlyoutItem x:Uid="/Main/signEx" Text="Sign in with existing account" Name="signIn" Click="signIn_Click"/>
<MenuFlyoutItem x:Uid="/Main/signNew" Text="Create new Google account" Name="createAccount" Click="createAccount_Click"/>
</MenuFlyout>
</Button.Flyout>
</Button>
<Button Width="50" Background="Transparent" Height="50" Visibility="Collapsed" Name="avatar">
<PersonPicture Width="30"/>
<ToolTipService.ToolTip x:Uid="myAccount">My account</ToolTipService.ToolTip>
<PersonPicture Width="30" ToolTipService.ToolTip="My account" x:Uid="myAccount"/>
<Button.Flyout>
<MenuFlyout>
<MenuFlyoutItem x:Uid="myChannel" Text="My channel" Name="myChannel" Click="myChannel_Click"/>
<MenuFlyoutItem x:Uid="/Main/myChannelContext" Text="My channel" Name="myChannel" Click="myChannel_Click"/>
<MenuFlyoutSeparator/>
<MenuFlyoutItem x:Uid="signOut" Text="Log out" Name="logout" Click="logout_Click"/>
<MenuFlyoutItem x:Uid="/Main/signOut" Text="Log out" Name="logout" Click="logout_Click"/>
</MenuFlyout>
</Button.Flyout>
</Button>
+4 -4
View File
@@ -11,22 +11,22 @@
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Pivot SelectedIndex="0" Name="pivot" IsHeaderItemsCarouselEnabled="False" SelectionChanged="pivot_SelectionChanged">
<PivotItem Header="General">
<PivotItem Header="General" x:Uid="general">
<ScrollViewer>
<settingspages:General/>
</ScrollViewer>
</PivotItem>
<PivotItem Header="About us">
<PivotItem Header="About us" x:Uid="about">
<ScrollViewer>
<settingspages:About/>
</ScrollViewer>
</PivotItem>
<PivotItem Header="Help us translate this app">
<PivotItem Header="Help us translate this app" x:Uid="helpTranslate">
<ScrollViewer>
<settingspages:Translate/>
</ScrollViewer>
</PivotItem>
<PivotItem Header="Inbox">
<PivotItem Header="Inbox" x:Uid="inbox">
<ScrollViewer>
<settingspages:Inbox/>
</ScrollViewer>
+14 -14
View File
@@ -28,29 +28,29 @@
</Grid.ColumnDefinitions>
<StackPanel>
<TextBlock Text="About us and this app" FontSize="28"/>
<TextBlock x:Uid="aboutHeader" Text="About us and this app" FontSize="28"/>
<TextBlock Text="FoxTube" FontSize="24"/>
<TextBlock Name="version" Text="[currentVersion]" FontSize="14" Foreground="Gray" Margin="0,-5,0,10"/>
<TextBlock TextWrapping="WrapWholeWords" Text="Developed by Michael Gordeev (also known as XFox)" Margin="0,0,0,10"/>
<TextBlock x:Uid="developed" TextWrapping="WrapWholeWords" Text="Developed by Michael Gordeev (also known as XFox)" Margin="0,0,0,10"/>
<TextBlock TextWrapping="WrapWholeWords" Visibility="Collapsed" Text="Special thanks to contributors for motivating me, testers and translators for making this app better everyday and you for using this app;)" Margin="0,0,0,10"/>
<TextBlock Text="Contacts" FontSize="22" FontWeight="SemiBold"/>
<TextBlock>Twitter: <Hyperlink NavigateUri="https://twitter.com/XFox_Mike">@XFox_Mike</Hyperlink></TextBlock>
<TextBlock>Vkontakte: <Hyperlink NavigateUri="https://vk.com/XFox.Mike">@XFox.Mike</Hyperlink></TextBlock>
<TextBlock x:Uid="contacts" Text="Contacts" FontSize="22" FontWeight="SemiBold"/>
<TextBlock><Run x:Uid="twitter">Twitter:</Run> <Hyperlink NavigateUri="https://twitter.com/XFox_Mike">@XFox_Mike</Hyperlink></TextBlock>
<TextBlock><Run x:Uid="vk">Vkontakte:</Run> <Hyperlink NavigateUri="https://vk.com/XFox.Mike">@XFox.Mike</Hyperlink></TextBlock>
<TextBlock>YouTube: <Hyperlink NavigateUri="https://youtube.com/c/FoxGameStudioChannel">@FoxGameStudioChannel</Hyperlink></TextBlock>
<TextBlock>E-mail: <Hyperlink NavigateUri="mailto:michael.xfox@outlook.com">michael.xfox@outlook.com</Hyperlink></TextBlock>
<TextBlock Margin="0,0,0,10">My blog (Russian language only): <Hyperlink NavigateUri="https://michael-xfox.com">https://michael-xfox.com</Hyperlink></TextBlock>
<TextBlock Margin="0,0,0,10"> <Run x:Uid="myBlog">My blog (Russian language only):</Run><Hyperlink NavigateUri="https://michael-xfox.com">https://michael-xfox.com</Hyperlink></TextBlock>
<TextBlock Text="Legal stuff" FontSize="22" FontWeight="SemiBold"/>
<HyperlinkButton Content="Our Privacy Policy" NavigateUri="https://michael-xfox.com/foxtubepp.txt" Padding="0,5,0,0"/>
<HyperlinkButton Content="YouTube Privacy Policy" NavigateUri="https://youtube.com/t/privacy" Padding="0"/>
<HyperlinkButton Content="YouTube Terms of use" NavigateUri="https://youtube.com/t/terms" Padding="0"/>
<HyperlinkButton Content="YouTube Community Guidelines" NavigateUri="https://youtube.com/t/community_guidelines" Padding="0,0,0,10"/>
<TextBlock Text="© 2018 Michael Gordeev"/>
<TextBlock Text="© 2018 YouTube, LLC"/>
<Button Content="Leave feedback" Margin="0,5" Click="Button_Click"/>
<TextBlock x:Uid="legal" Text="Legal stuff" FontSize="22" FontWeight="SemiBold"/>
<HyperlinkButton x:Uid="ourPrivacy" Content="Our Privacy Policy" NavigateUri="https://michael-xfox.com/foxtubepp.txt" Padding="0,5,0,0"/>
<HyperlinkButton x:Uid="ytPrivacy" Content="YouTube Privacy Policy" NavigateUri="https://youtube.com/t/privacy" Padding="0"/>
<HyperlinkButton x:Uid="terms" Content="YouTube Terms of use" NavigateUri="https://youtube.com/t/terms" Padding="0"/>
<HyperlinkButton x:Uid="guides" Content="YouTube Community Guidelines" NavigateUri="https://youtube.com/t/community_guidelines" Padding="0,0,0,10"/>
<TextBlock x:Uid="crMe" Text="© 2018 Michael Gordeev"/>
<TextBlock x:Uid="crYt" Text="© 2018 YouTube, LLC"/>
<Button x:Uid="feedback" Content="Leave feedback" Margin="0,5" Click="Button_Click"/>
</StackPanel>
<Image Grid.Column="1" Source="/Assets/LogoAvatar.png" VerticalAlignment="Top" Width="128"/>
</Grid>
+23 -22
View File
@@ -9,23 +9,23 @@
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<StackPanel Orientation="Vertical">
<TextBlock Text="Preferences" FontSize="28"/>
<TextBlock Text="Region &#x26; search" FontSize="22"/>
<ComboBox Header="App interface language" MinWidth="250" Name="language" SelectionChanged="language_SelectionChanged">
<ComboBoxItem Content="English (United States)"/>
<ComboBoxItem Content="Russian (Russia)"/>
<TextBlock x:Uid="preferences" Text="Preferences" FontSize="28"/>
<TextBlock x:Uid="regNsearch" Text="Region &#x26; search" FontSize="22"/>
<ComboBox x:Uid="interfaceLang" Header="App interface language" MinWidth="250" Name="language" SelectionChanged="language_SelectionChanged">
<ComboBoxItem x:Uid="en" Content="English (United States)"/>
<ComboBoxItem x:Uid="ru" Content="Russian (Russia)"/>
</ComboBox>
<TextBlock Foreground="Red" Name="restartNote" Text="Reopen the app to apply settings" Visibility="Collapsed"/>
<ComboBox Header="Region" MinWidth="250" Name="region" SelectionChanged="region_SelectionChanged"/>
<ComboBox Header="SafeSearch" MinWidth="250" Name="safeSearch" SelectionChanged="safeSearch_SelectionChanged">
<ComboBoxItem Content="Moderate"/>
<ComboBoxItem Content="None"/>
<ComboBoxItem Content="Strict"/>
<TextBlock x:Uid="restart" Foreground="Red" Name="restartNote" Text="Reopen the app to apply settings" Visibility="Collapsed"/>
<ComboBox x:Uid="region" Header="Region" MinWidth="250" Name="region" SelectionChanged="region_SelectionChanged"/>
<ComboBox x:Uid="safeSearch" Header="SafeSearch" MinWidth="250" Name="safeSearch" SelectionChanged="safeSearch_SelectionChanged">
<ComboBoxItem x:Uid="moderate" Content="Moderate"/>
<ComboBoxItem x:Uid="none" Content="None"/>
<ComboBoxItem x:Uid="strict" Content="Strict"/>
</ComboBox>
<TextBlock Text="Playback" FontSize="22"/>
<ComboBox Width="250" Header="Default video playback quality" Name="quality" SelectionChanged="quality_SelectionChanged">
<ComboBoxItem Content="Remember my choice"/>
<TextBlock x:Uid="playback" Text="Playback" FontSize="22"/>
<ComboBox x:Uid="quality" Width="250" Header="Default video playback quality" Name="quality" SelectionChanged="quality_SelectionChanged">
<ComboBoxItem x:Uid="remember" Content="Remember my choice"/>
<ComboBoxItem Content="2160p"/>
<ComboBoxItem Content="1080p"/>
<ComboBoxItem Content="720p"/>
@@ -34,15 +34,16 @@
<ComboBoxItem Content="240p"/>
<ComboBoxItem Content="144p"/>
</ComboBox>
<ToggleSwitch OnContent="Notify when playing on metered connection" OffContent="Notify when playing on metered connection" Name="mobileWarning" Toggled="notification_IsEnabledChanged"/>
<ToggleSwitch OnContent="Play videos automatically" OffContent="Play videos automatically" Name="autoplay" Toggled="notification_IsEnabledChanged"/>
<ToggleSwitch x:Uid="metered" OnContent="Notify when playing on metered connection" OffContent="Notify when playing on metered connection" Name="mobileWarning" Toggled="notification_IsEnabledChanged"/>
<ToggleSwitch x:Uid="autoplay" OnContent="Play videos automatically" OffContent="Play videos automatically" Name="autoplay" Toggled="notification_IsEnabledChanged"/>
<TextBlock Text="Notifications" FontSize="22"/>
<TextBlock x:Uid="notifications" Text="Notifications" FontSize="22"/>
<ToggleSwitch x:Uid="newVideo" Name="newVideo" OnContent="Notify when someone of your subscriptions uploaded new video" OffContent="Notify when someone of your subscriptions uploaded new video" Toggled="notification_IsEnabledChanged"/>
<TextBlock Text="Color mode" FontSize="22"/>
<RadioButton Content="Light" Name="light" GroupName="color" Checked="RadioButton_Checked"/>
<RadioButton Content="Dark" Name="dark" GroupName="color" Checked="RadioButton_Checked"/>
<RadioButton Content="Windows default" Name="system" GroupName="color" Checked="RadioButton_Checked"/>
<HyperlinkButton Content="Windows color settings" NavigateUri="ms-settings:colors"/>
<TextBlock x:Uid="color" Text="Color mode" FontSize="22"/>
<RadioButton x:Uid="colorLight" Content="Light" Name="light" GroupName="color" Checked="RadioButton_Checked"/>
<RadioButton x:Uid="colorDark" Content="Dark" Name="dark" GroupName="color" Checked="RadioButton_Checked"/>
<RadioButton x:Uid="colorDefault" Content="Windows default" Name="system" GroupName="color" Checked="RadioButton_Checked"/>
<HyperlinkButton x:Uid="colorSystem" Content="Windows color settings" NavigateUri="ms-settings:colors"/>
</StackPanel>
</Page>
+5 -5
View File
@@ -55,10 +55,10 @@
</Grid.ColumnDefinitions>
<ScrollViewer Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}">
<StackPanel VerticalAlignment="Stretch">
<ComboBox Header="Filter" Margin="10" HorizontalAlignment="Stretch" SelectedIndex="0" Name="filter" SelectionChanged="filter_SelectionChanged">
<ComboBoxItem Content="All"/>
<ComboBoxItem Content="Messages"/>
<ComboBoxItem Content="Patch notes"/>
<ComboBox x:Uid="filter" Header="Filter" Margin="10" HorizontalAlignment="Stretch" SelectedIndex="0" Name="filter" SelectionChanged="filter_SelectionChanged">
<ComboBoxItem x:Uid="all" Content="All"/>
<ComboBoxItem x:Uid="messages" Content="Messages"/>
<ComboBoxItem x:Uid="changelogs" Content="Patch notes"/>
</ComboBox>
<ListBox Name="list" SelectionChanged="list_SelectionChanged" Background="Transparent">
<ListBox.ItemContainerStyle>
@@ -101,7 +101,7 @@
<Grid Grid.Column="1" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Name="block">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE7EA;" FontSize="70" Foreground="Gray" Margin="10"/>
<TextBlock Text="Select item from list" FontSize="30" VerticalAlignment="Center" Foreground="Gray"/>
<TextBlock x:Uid="select" Text="Select item from list" FontSize="30" VerticalAlignment="Center" Foreground="Gray"/>
</StackPanel>
</Grid>
</Grid>