From 906040f466afc287432a120c9f35675fc296d5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Mon, 29 Aug 2022 10:22:45 +0100 Subject: [PATCH 1/9] Localise UserHomePage --- .../Strings/en-US/Resources.resw | 55 +++++++++++++------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index e7293f4c6..eb3ffb3a2 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -59,46 +59,46 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> - - + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -126,6 +126,21 @@ Click "Open FluentHub DEV"; + + Favorites + + + No favorite items available. + + + Work + + + Home + + + Recent + Documentation @@ -135,6 +150,12 @@ Login with GitHub + + New + + + Repositories + If you are in administration of one or more organizations, please give FluentHub access to them; From d9c3f3348871d0d6bd27adc962cd1ccb571e737c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Tue, 30 Aug 2022 09:56:55 +0100 Subject: [PATCH 2/9] Localise NotificationsPage --- .../Strings/en-US/Resources.resw | 54 +++++++++++++++++++ .../Views/Home/NotificationsPage.xaml | 49 +++++++++-------- 2 files changed, 81 insertions(+), 22 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index eb3ffb3a2..68073d2c1 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -153,6 +153,60 @@ New + + ๐Ÿ“‹ Assigned + + + Done + + + Filter by: + + + Inbox + + + โœ‰๏ธ Mentioned + + + ๐Ÿ“ง Team Mentioned + + + ๐Ÿคโ€ Participating + + + ๐Ÿ‘€ Review Requested + + + Saved + + + Group by: + + + None + + + Date + + + Repository + + + Notifications + + + No recent notifications.. + + + Search notifications + + + Unread + + + Refresh + Repositories diff --git a/src/FluentHub.Uwp/Views/Home/NotificationsPage.xaml b/src/FluentHub.Uwp/Views/Home/NotificationsPage.xaml index 4df52f37b..0be8c6645 100644 --- a/src/FluentHub.Uwp/Views/Home/NotificationsPage.xaml +++ b/src/FluentHub.Uwp/Views/Home/NotificationsPage.xaml @@ -6,6 +6,7 @@ xmlns:block="using:FluentHub.Uwp.UserControls.ButtonBlocks" xmlns:converters="using:FluentHub.Uwp.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:helpers="using:FluentHub.Uwp.Helpers" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" @@ -36,9 +37,10 @@ + Text="{helpers:ResourceString Name=NotificationsPageHeader/Text}" /> - + - + Text="{helpers:ResourceString Name=NotificationsPageFilterByReasonFlyoutBody/Text}" /> + - - - + + + - - - - - + + + + + - + - + Text="{helpers:ResourceString Name=NotificationsPageGroupByViewFlyoutBody/Text}" /> + - - - - - + + + @@ -174,7 +178,7 @@ - + @@ -207,10 +211,11 @@ From 03f63ef7cd7a591b92726fdbf341eb7de8ba869a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Tue, 30 Aug 2022 10:06:11 +0100 Subject: [PATCH 3/9] Localise FeedsPage --- src/FluentHub.Uwp/Strings/en-US/Resources.resw | 8 +++++++- src/FluentHub.Uwp/Views/Home/FeedsPage.xaml | 13 ++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index 68073d2c1..ce7a95b2d 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Activity + + + No recent activity. + Proceed to the FluentHub application. @@ -196,7 +202,7 @@ Notifications - No recent notifications.. + No recent notifications. Search notifications diff --git a/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml b/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml index a9b94f3d7..469083f18 100644 --- a/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml +++ b/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml @@ -6,6 +6,7 @@ xmlns:bvm="using:FluentHub.Uwp.ViewModels.UserControls.Blocks" xmlns:converters="using:FluentHub.Uwp.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:helpers="using:FluentHub.Uwp.Helpers" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:modelsV4="using:FluentHub.Octokit.Models.v4" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" @@ -58,9 +59,10 @@ + Text="{helpers:ResourceString Name=RepositoriesListHeader/Text}" /> @@ -134,9 +136,10 @@ + Text="{helpers:ResourceString Name=FeedsPageHeader/Text}" /> @@ -160,7 +163,7 @@ - + @@ -168,7 +171,7 @@ - + From 9e984413af208149f196870bebe514c049eafc77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Tue, 30 Aug 2022 12:49:34 +0100 Subject: [PATCH 4/9] Localise MainPage --- .../Strings/en-US/Resources.resw | 44 ++++++++++++++++++- src/FluentHub.Uwp/Views/Home/FeedsPage.xaml | 2 +- .../Views/Home/UserHomePage.xaml | 4 +- src/FluentHub.Uwp/Views/MainPage.xaml | 44 ++++++++++++------- 4 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index ce7a95b2d..80260d7ad 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Account Settings + + + Not available yet. + Activity @@ -156,9 +162,15 @@ Login with GitHub - + New + + New organization + + + New repository + ๐Ÿ“‹ Assigned @@ -219,7 +231,37 @@ If you are in administration of one or more organizations, please give FluentHub access to them; + + Settings + + + Sign Out + + + Switch account + Click "Authorize FluentHub"; + + Your Discussions + + + Your Issues + + + Your Organizations + + + Your Profile + + + Your Pull Requests + + + Your Repositories + + + Your Stars + \ No newline at end of file diff --git a/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml b/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml index 469083f18..b54ad1c3e 100644 --- a/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml +++ b/src/FluentHub.Uwp/Views/Home/FeedsPage.xaml @@ -70,7 +70,7 @@ FontFamily="{StaticResource Octicons}" FontSize="14" Glyph="" /> - + diff --git a/src/FluentHub.Uwp/Views/Home/UserHomePage.xaml b/src/FluentHub.Uwp/Views/Home/UserHomePage.xaml index a23b14bd3..a711ca8de 100644 --- a/src/FluentHub.Uwp/Views/Home/UserHomePage.xaml +++ b/src/FluentHub.Uwp/Views/Home/UserHomePage.xaml @@ -65,7 +65,7 @@ x:Name="RepositoriesListHeader" VerticalAlignment="Center" Style="{StaticResource SubtitleTextBlockStyle}" - Text="{helpers:ResourceString Name=RepositoriesHeader/Text}" /> + Text="{helpers:ResourceString Name=RepositoriesListHeader/Text}" /> diff --git a/src/FluentHub.Uwp/Views/MainPage.xaml b/src/FluentHub.Uwp/Views/MainPage.xaml index e497bab73..89645d8c9 100644 --- a/src/FluentHub.Uwp/Views/MainPage.xaml +++ b/src/FluentHub.Uwp/Views/MainPage.xaml @@ -5,6 +5,7 @@ xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:converters="using:FluentHub.Uwp.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:helpers="using:FluentHub.Uwp.Helpers" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:icore="using:Microsoft.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -259,65 +260,76 @@ - + + Text="{helpers:ResourceString Name=NewMutationRepoButton/Text}" /> + Text="{helpers:ResourceString Name=NewMutationOrganizationButton/Text}" /> + Text="{helpers:ResourceString Name=UserProfileButton/Text}" /> + Text="{helpers:ResourceString Name=UserRepositoriesButton/Text}" /> + Text="{helpers:ResourceString Name=UserDiscussionsButton/Text}" /> + Text="{helpers:ResourceString Name=UserIssuesButton/Text}" /> + Text="{helpers:ResourceString Name=UserPullRequestsButton/Text}" /> + Text="{helpers:ResourceString Name=UserOrganizationsButton/Text}" /> + Text="{helpers:ResourceString Name=UserStarsButton/Text}" /> - - + + + Text="{helpers:ResourceString Name=AccountSettingsButton/Text}" /> + Text="{helpers:ResourceString Name=SettingsButton/Text}" /> + Text="{helpers:ResourceString Name=SignOutButton/Text}" /> - From 1aa0f619cc4217acd3c2e05614c97a14349986dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Tue, 30 Aug 2022 13:45:03 +0100 Subject: [PATCH 5/9] Re-localise MainPage Re-localised for the purpose of supporting #238 --- src/FluentHub.Uwp/Strings/en-US/Resources.resw | 12 ++++++++++++ src/FluentHub.Uwp/Views/MainPage.xaml | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index 80260d7ad..000c9e3dd 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -138,6 +138,12 @@ Click "Open FluentHub DEV"; + + Back + + + Forward + Favorites @@ -228,6 +234,12 @@ Repositories + + Search + + + Search + If you are in administration of one or more organizations, please give FluentHub access to them; diff --git a/src/FluentHub.Uwp/Views/MainPage.xaml b/src/FluentHub.Uwp/Views/MainPage.xaml index 77573261b..324523b12 100644 --- a/src/FluentHub.Uwp/Views/MainPage.xaml +++ b/src/FluentHub.Uwp/Views/MainPage.xaml @@ -152,7 +152,7 @@ Background="Transparent" BorderThickness="0" Click="OnSearchBarButtonClick" - ToolTipService.ToolTip="Search"> + ToolTipService.ToolTip="{helpers:ResourceString Name=SearchBarButton/ToolTipService/Tooltip}"> @@ -166,7 +166,7 @@ x:Name="SearchBar" LostFocus="OnSearchBarLostFocus" Visibility="Collapsed" - PlaceholderText="Search" + PlaceholderText="{helpers:ResourceString Name=SearchBar/PlaceholderText}" Width="256" Height="32"/> @@ -180,7 +180,7 @@ BorderThickness="0" Command="{x:Bind ViewModel.GoBackCommand, Mode=OneWay}" IsEnabled="{Binding SelectedItem.NavigationHistory.CanGoBack, ElementName=TabView, FallbackValue=false}" - ToolTipService.ToolTip="Back"> + ToolTipService.ToolTip="{helpers:ResourceString Name=GoBackButton/ToolTipService/Tooltip}"> @@ -204,7 +204,7 @@ BorderThickness="0" Command="{x:Bind ViewModel.GoForwardCommand, Mode=OneWay}" IsEnabled="{Binding SelectedItem.NavigationHistory.CanGoForward, ElementName=TabView, FallbackValue=false}" - ToolTipService.ToolTip="Forward"> + ToolTipService.ToolTip="{helpers:ResourceString Name=GoForwardButton/TooltipService/Tooltip}"> From f1ec06012e5745a6f29d253c3b06b4c637976f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Tue, 30 Aug 2022 14:28:00 +0100 Subject: [PATCH 6/9] Edit flyout capitalisation --- src/FluentHub.Uwp/Strings/en-US/Resources.resw | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index 000c9e3dd..1644a2faa 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -256,24 +256,24 @@ Click "Authorize FluentHub"; - Your Discussions + Your discussions - Your Issues + Your issues - Your Organizations + Your organizations - Your Profile + Your profile - Your Pull Requests + Your pull requests - Your Repositories + Your repositories - Your Stars + Your stars \ No newline at end of file From 605d5ce374e2d16e4b3930acdff27857ea5cb78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Tue, 30 Aug 2022 15:08:36 +0100 Subject: [PATCH 7/9] Localise AppearancePage --- .../Strings/en-US/Resources.resw | 29 +++++++++++++++- .../Views/AppSettings/AppearancePage.xaml | 34 ++++++++++++------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index 1644a2faa..b7eaa28c1 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -120,6 +120,27 @@ Account Settings + + Choose your color + + + General + + + Appearance + + + Appearance + + + Language + + + Language + + + Custom themes + Not available yet. @@ -156,7 +177,7 @@ Home - + Recent @@ -246,6 +267,12 @@ Settings + + Feedback + + + Get help + Sign Out diff --git a/src/FluentHub.Uwp/Views/AppSettings/AppearancePage.xaml b/src/FluentHub.Uwp/Views/AppSettings/AppearancePage.xaml index e472d4bf4..7d56d12d7 100644 --- a/src/FluentHub.Uwp/Views/AppSettings/AppearancePage.xaml +++ b/src/FluentHub.Uwp/Views/AppSettings/AppearancePage.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:helpers="using:FluentHub.Uwp.Helpers" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:overview="using:FluentHub.Uwp.UserControls.Overview" xmlns:uc="using:FluentHub.Uwp.UserControls" @@ -32,20 +33,22 @@ + Text="{helpers:ResourceString Name=AppearancePageHeader/Text}" /> + Text="{helpers:ResourceString Name=AppearancePageGeneralHeader/Text}" /> - + @@ -53,25 +56,34 @@ - + - + - + + + + + + - + @@ -83,15 +95,11 @@ Spacing="4"> - - Get help - + - - Give feedback - + From e5458cc241fac0776cd96d55ff3a68d2757a9a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Sat, 3 Sep 2022 07:32:21 +0100 Subject: [PATCH 8/9] Clean NumberNormalizerHelper --- src/FluentHub.Uwp/Helpers/NumberNormalizerHelper.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/FluentHub.Uwp/Helpers/NumberNormalizerHelper.cs b/src/FluentHub.Uwp/Helpers/NumberNormalizerHelper.cs index cb8d07bda..eac4fd797 100644 --- a/src/FluentHub.Uwp/Helpers/NumberNormalizerHelper.cs +++ b/src/FluentHub.Uwp/Helpers/NumberNormalizerHelper.cs @@ -1,10 +1,4 @@ -๏ปฟusing System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace FluentHub.Uwp.Helpers +๏ปฟnamespace FluentHub.Uwp.Helpers { public static class NumberNormalizerHelper { @@ -13,9 +7,9 @@ public static class NumberNormalizerHelper private const int Billion = 1000000000; /// - /// This method convert number (greater then 999) to readable form, like 25.5k, 1.2m, 2.4b + /// This method converts numbers (greater then 999) to a readable form, such as 25.5k, 1.2m, 2.4b /// - /// Positive integer value which more then 999 + /// Positive integer value that is more than 999 /// String value of normalized number (e.g. 25.5k) public static string NormalizeNumber(int number) { From 7e5605cc0f2f18faf37e7e6d38dd271a79b42d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=AC=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9?= Date: Sat, 3 Sep 2022 07:36:01 +0100 Subject: [PATCH 9/9] Fix AZP build error --- src/FluentHub.Uwp/Strings/en-US/Resources.resw | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/FluentHub.Uwp/Strings/en-US/Resources.resw b/src/FluentHub.Uwp/Strings/en-US/Resources.resw index b7eaa28c1..d2aa5b3d3 100644 --- a/src/FluentHub.Uwp/Strings/en-US/Resources.resw +++ b/src/FluentHub.Uwp/Strings/en-US/Resources.resw @@ -126,9 +126,6 @@ General - - Appearance - Appearance