收尾工作

sovetskyfish · May 30, 2019 · 9338c17 · 9338c17
1 parent 3ca388e
commit 9338c17
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/PixivFSUWP/SearchPage.xaml.cs b/PixivFSUWP/SearchPage.xaml.cs
@@ -17,6 +17,7 @@
 using PixivCS;
 using Windows.UI.Xaml.Media.Imaging;
 using PixivFSUWP.Interfaces;
+using static PixivFSUWP.Data.OverAll;
 
 // https://go.microsoft.com/fwlink/?LinkId=234238 上介绍了“空白页”项模板
 
@@ -85,7 +86,7 @@ async Task loadContents()
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
-            ((Frame.Parent as Grid)?.Parent as MainPage)?.SelectNavPlaceholder("搜索");
+            ((Frame.Parent as Grid)?.Parent as MainPage)?.SelectNavPlaceholder(GetResourceString("SearchPagePlain"));
         }
 
         public async Task ShowSearch()

diff --git a/PixivFSUWP/SettingsPage.xaml.cs b/PixivFSUWP/SettingsPage.xaml.cs
@@ -43,7 +43,7 @@ public void SetBackFlag(bool value)
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
-            ((Frame.Parent as Grid)?.Parent as MainPage)?.SelectNavPlaceholder("设置");
+            ((Frame.Parent as Grid)?.Parent as MainPage)?.SelectNavPlaceholder(GetResourceString("SettingsPagePlain"));
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)

diff --git a/PixivFSUWP/Strings/zh/Resources.resw b/PixivFSUWP/Strings/zh/Resources.resw
@@ -121,6 +121,10 @@
     <value>所有时间</value>
     <comment>ComboBoxItem</comment>
   </data>
+  <data name="ArtistPlain" xml:space="preserve">
+    <value>画师</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="Birthday.Text" xml:space="preserve">
     <value>生日</value>
     <comment>TextBlock</comment>
@@ -209,6 +213,10 @@
     <value>邮箱</value>
     <comment>TextBlock</comment>
   </data>
+  <data name="FemalePlain" xml:space="preserve">
+    <value>女</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="Following.Content" xml:space="preserve">
     <value>关注</value>
     <comment>NavigationViewItem</comment>
@@ -297,6 +305,10 @@
     <value>*这将在您的所有Windows设备上退出登录</value>
     <comment>TextBlock</comment>
   </data>
+  <data name="MalePlain" xml:space="preserve">
+    <value>男</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="Monitor.Text" xml:space="preserve">
     <value>显示器</value>
     <comment>TextBlock</comment>
@@ -369,6 +381,10 @@
     <value>已固定</value>
     <comment>PlainText</comment>
   </data>
+  <data name="PixivUserPlain" xml:space="preserve">
+    <value>Pixiv用户</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="PlayingUgoiraPlain" xml:space="preserve">
     <value>正在播放动态剪影</value>
     <comment>PlainText</comment>
@@ -381,6 +397,14 @@
     <value>打印机</value>
     <comment>TextBlock</comment>
   </data>
+  <data name="PrivateOrNonePlain" xml:space="preserve">
+    <value>无/保密</value>
+    <comment>PlainText</comment>
+  </data>
+  <data name="PrivatePlain" xml:space="preserve">
+    <value>保密</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="QuickBookmark.Text" xml:space="preserve">
     <value>快速收藏</value>
     <comment>MenuFlyoutItem</comment>
@@ -469,6 +493,14 @@
     <value>搜索选项</value>
     <comment>TextBlock</comment>
   </data>
+  <data name="SearchPagePlain" xml:space="preserve">
+    <value>搜索</value>
+    <comment>PlainText</comment>
+  </data>
+  <data name="SettingsPagePlain" xml:space="preserve">
+    <value>设置</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="Sex.Text" xml:space="preserve">
     <value>性别</value>
     <comment>TextBlock</comment>
@@ -509,10 +541,18 @@
     <value>趋势标签</value>
     <comment>TextBlock</comment>
   </data>
+  <data name="UnknownPlain" xml:space="preserve">
+    <value>未知</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="Unpinned.Text" xml:space="preserve">
     <value>未固定</value>
     <comment>TextBlock</comment>
   </data>
+  <data name="UserDetailPagePlain" xml:space="preserve">
+    <value>用户</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="UserID.Text" xml:space="preserve">
     <value>用户标识</value>
     <comment>TextBlock</comment>
@@ -521,6 +561,10 @@
     <value>用户名</value>
     <comment>TextBlock</comment>
   </data>
+  <data name="UserShareTipPlain" xml:space="preserve">
+    <value>该用户页面的链接将被分享</value>
+    <comment>PlainText</comment>
+  </data>
   <data name="VersionInfo.Text" xml:space="preserve">
     <value>软件包版本信息</value>
     <comment>TextBlock</comment>

diff --git a/PixivFSUWP/UserDetailPage.xaml.cs b/PixivFSUWP/UserDetailPage.xaml.cs
@@ -65,7 +65,7 @@ private void DataTransferManager_DataRequested(DataTransferManager sender, DataR
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            ((Frame.Parent as Grid)?.Parent as MainPage)?.SelectNavPlaceholder("用户");
+            ((Frame.Parent as Grid)?.Parent as MainPage)?.SelectNavPlaceholder(GetResourceString("UserDetailPagePlain"));
             userid = (int)e.Parameter;
             itemsSource = new UserIllustsCollection(userid.ToString());
             itemsSource.CollectionChanged += ItemsSource_CollectionChanged;