Merge branch 'PiranhaCMS:master' into feature/use-identity-stores

PiranhaCMS · Aug 11, 2021 · 174e9a9 · 174e9a9
2 parents 43b9eef + 7e5ac03
commit 174e9a9
Show file tree

Hide file tree

Showing 38 changed files with 305 additions and 269 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Package information">
-    <Version>9.1.0-beta1</Version>
+    <Version>9.1.0</Version>
     <Authors>Piranha CMS</Authors>
     <Company>Piranha CMS</Company>
     <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>

diff --git a/core/Piranha.AspNetCore/PiranhaMiddleware.cs b/core/Piranha.AspNetCore/PiranhaMiddleware.cs
@@ -110,7 +110,7 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
                     service.Site.Culture = site.Culture;
                     service.Site.Sitemap = await api.Sites.GetSitemapAsync(site.Id);
 
-                    // Set prefered hostname & prefix
+                    // Set preferred hostname & prefix
                     var siteHost = GetMatchingHost(site, hostname);
                     service.Site.Host = siteHost[0];
                     service.Site.SitePrefix = siteHost[1];
@@ -225,7 +225,7 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
                     {
                         App.PostTypes.GetById(post.TypeId);
 
-                        // Onlyc cache published posts
+                        // Only cache published posts
                         if (post.IsPublished)
                         {
                             service.CurrentPost = post;

diff --git a/core/Piranha.Manager.Localization/Resources/Alias.zh.resx b/core/Piranha.Manager.Localization/Resources/Alias.zh.resx
@@ -13,36 +13,36 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Aliases" xml:space="preserve">
-    <value>别名</value>
+    <value>別名</value>
   </data>
   <data name="Add new alias" xml:space="preserve">
-    <value>添加新别名</value>
+    <value>新增別名</value>
   </data>
   <data name="Alias URL" xml:space="preserve">
-    <value>别名网址</value>
+    <value>別名網址</value>
   </data>
   <data name="Alias URL is mandatory." xml:space="preserve">
-    <value>别名网址必填。</value>
+    <value>別名網址是必填項。</value>
   </data>
   <data name="Redirect URL" xml:space="preserve">
-    <value>重定向网址</value>
+    <value>導向網址</value>
   </data>
   <data name="Redirect URL is mandatory." xml:space="preserve">
-    <value>重定向网址必填。</value>
+    <value>導向網址是必填項。</value>
   </data>
   <data name="Permanent" xml:space="preserve">
     <value>永久</value>
   </data>
   <data name="Are you sure you want to delete this alias?" xml:space="preserve">
-    <value>是否确定删除此别名？</value>
+    <value>是否確定要刪除此別名？</value>
   </data>
   <data name="If the redirect should be permanent" xml:space="preserve">
-    <value>重定向是否永久</value>
+    <value>這個導向網址應該是永久的</value>
   </data>
   <data name="The alias was successfully added to the list" xml:space="preserve">
-    <value>该别名已成功加入列表</value>
+    <value>該別名已加入列表中</value>
   </data>
   <data name="The alias was successfully deleted" xml:space="preserve">
-    <value>该别名已成功删除</value>
+    <value>該別名已成功刪除</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/Content.zh.resx b/core/Piranha.Manager.Localization/Resources/Content.zh.resx
@@ -13,33 +13,33 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Excerpt" xml:space="preserve">
-    <value>摘要</value>
+    <value>摘录</value>
   </data>
   <data name="Meta index" xml:space="preserve">
-    <value>關鍵值索引</value>
+    <value>关键值索引</value>
   </data>
   <data name="Meta follow" xml:space="preserve">
-    <value>關鍵值流程</value>
+    <value>关键值流程</value>
   </data>
   <data name="Meta priority" xml:space="preserve">
-    <value>關鍵值優先</value>
+    <value>关健值优先</value>
   </data>
   <data name="Primary image" xml:space="preserve">
-    <value>主要圖片</value>
+    <value>主要图像</value>
   </data>
   <data name="Search engine priority, compared to other content in the same site." xml:space="preserve">
-    <value>搜尋引擎優先</value>
+    <value>与同一站点中的其他内容相比，搜索引擎优先级。</value>
   </data>
   <data name="The content was successfully deleted" xml:space="preserve">
-    <value>本內容已成功刪除</value>
+    <value>内容已成功删除</value>
   </data>
   <data name="An error occured while deleting the content" xml:space="preserve">
-    <value>刪除內容時發生錯誤</value>
+    <value>删除内容时发生错误</value>
   </data>
   <data name="The content was successfully saved" xml:space="preserve">
-    <value>本內容已成功儲存</value>
+    <value>内容已成功保存</value>
   </data>
   <data name="An error occured while saving the content" xml:space="preserve">
-    <value>儲存內容時發生錯誤</value>
+    <value>保存内容时发生错误</value>
   </data>
 </root>