zh-Hans追加、トゥート→投稿 #160

cinderella-project · Jan 12, 2020 · ca0e4f0 · ca0e4f0
1 parent ceeedb0
commit ca0e4f0
Show file tree

Hide file tree

Showing 10 changed files with 322 additions and 310 deletions.
diff --git a/...ces/iOS/App/CustomViews/Post/PostDetail/MastodonPostDetailReactionBarViewController.swift b/...ces/iOS/App/CustomViews/Post/PostDetail/MastodonPostDetailReactionBarViewController.swift
@@ -141,7 +141,7 @@ class MastodonPostDetailReactionBarViewController: UIViewController, Instantiata
         if environment.screenName == input.account.acct {
             actionSheet.addAction(.init(title: "削除", style: .destructive) { [weak self] _ in
                 let message = Defaults[.deleteTootTeokure]
-                    ? "失った信頼はもう戻ってきませんが、本当にこのトゥートを削除しますか?"
+                    ? "失った信頼はもう戻ってきませんが、本当にこの投稿を削除しますか?"
                     : "この投稿を削除しますか?"
                 self?.confirm(title: "投稿の削除", message: message, okButtonMessage: "削除", style: .destructive).then { [weak self] res in
                     guard res else { return }

diff --git a/Sources/iOS/App/CustomViews/UserProfile/UserProfileTopViewController.swift b/Sources/iOS/App/CustomViews/UserProfile/UserProfileTopViewController.swift
@@ -119,7 +119,7 @@ class UserProfileTopViewController: StableTableViewController, Instantiatable, I
         createdAtSabunCell.detailTextLabel?.text = numToCommaString(-Int(createdAt.timeIntervalSinceNow/60/60/24)) + "日"
 
         let tootDaysCell = UITableViewCell(style: .value1, reuseIdentifier: nil)
-        tootDaysCell.textLabel?.text = "平均トゥート/日"
+        tootDaysCell.textLabel?.text = "平均投稿/日"
         tootDaysCell.detailTextLabel?.text = numToCommaString(-(input.postsCount/Int(min(-1, createdAt.timeIntervalSinceNow/60/60/24))))
         self.externalServiceLinks = []
 
@@ -295,7 +295,7 @@ class UserProfileTopViewController: StableTableViewController, Instantiatable, I
             if indexPath.row == 0 {
                 let newVC = UserTimeLineTableViewController.instantiate(.plain, environment: self.environment)
                 newVC.user = self.input
-                newVC.title = "トゥート一覧"
+                newVC.title = "投稿一覧"
                 self.navigationController?.pushViewController(newVC, animated: true)
                 return
             } else if indexPath.row == 1 || indexPath.row == 2 {

diff --git a/Sources/iOS/App/Generated/strings.swift b/Sources/iOS/App/Generated/strings.swift
@@ -187,7 +187,7 @@ internal enum L10n {
       }
     }
     internal enum Placeholders {
-      /// CW説明分 (省略可能)
+      /// CW説明文 (省略可能)
       internal static let cwWarningText = L10n.tr("NewPost", "placeholders.cwWarningText")
     }
   }
@@ -290,7 +290,7 @@ internal enum L10n {
         internal static let title = L10n.tr("UserProfile", "cells.following.title")
       }
       internal enum Toots {
-        /// トゥート
+        /// 投稿
         internal static let title = L10n.tr("UserProfile", "cells.toots.title")
       }
     }

diff --git a/Sources/iOS/App/R.generated.swift b/Sources/iOS/App/R.generated.swift
diff --git a/Sources/iOS/App/Screens/OtherMenu/Settings/SettingsViewController.swift b/Sources/iOS/App/Screens/OtherMenu/Settings/SettingsViewController.swift
@@ -127,7 +127,7 @@ class SettingsViewController: FormViewController {
     func getPostInfoSection() -> Section {
         return Section(header: "投稿詳細") {
             SwitchRow { row in
-                row.title = "トゥート削除をておくれにする"
+                row.title = "投稿削除をておくれにする"
                 row.userDefaultsConnect(.deleteTootTeokure)
             }
         }
@@ -188,7 +188,7 @@ class SettingsViewController: FormViewController {
                 row.userDefaultsConnect(.timelineNurunuruMode)
             }
             SliderRow { row in
-                row.title = "ピン留めトゥートの行数制限"
+                row.title = "ピン留め投稿の行数制限"
                 row.userDefaultsConnect(.pinnedTootLinesLimit)
                 row.steps = 10
                 row.displayValueFor = { ($0 ?? 0.0) == 0 ? "無制限" : "\(Int($0 ?? 0))行" }

diff --git a/Sources/iOS/App/Strings/ja.lproj/UserProfile.strings b/Sources/iOS/App/Strings/ja.lproj/UserProfile.strings
@@ -23,7 +23,7 @@
 
 "title" = "プロフィール";
 
-"cells.toots.title" = "トゥート";
+"cells.toots.title" = "投稿";
 "cells.following.title" = "フォロー";
 "cells.followers.title" = "フォロワー";
 "cells.createdAt.title" = "登録日";

diff --git a/Sources/iOS/Extensions/iMastIntents/Base.lproj/Intents.intentdefinition b/Sources/iOS/Extensions/iMastIntents/Base.lproj/Intents.intentdefinition
@@ -9,11 +9,11 @@
 	<key>INIntentDefinitionNamespace</key>
 	<string>wv5rhj</string>
 	<key>INIntentDefinitionSystemVersion</key>
-	<string>18F132</string>
+	<string>19C57</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>11M337n</string>
+	<string>11C29</string>
 	<key>INIntentDefinitionToolsVersion</key>
-	<string>11.0</string>
+	<string>11.3</string>
 	<key>INIntents</key>
 	<array>
 		<dict>
@@ -32,7 +32,7 @@
 					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
 					<true/>
 					<key>INIntentParameterCombinationTitle</key>
-					<string>Toot ${text} in ${account}</string>
+					<string>Post ${text} in ${account}</string>
 					<key>INIntentParameterCombinationTitleID</key>
 					<string>QvjTtH</string>
 				</dict>
@@ -48,7 +48,7 @@
 					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
 					<true/>
 					<key>INIntentParameterCombinationTitle</key>
-					<string>${text}を${account}でトゥート</string>
+					<string>${text}を${account}で投稿</string>
 					<key>INIntentParameterCombinationTitleID</key>
 					<string>ULKkKs</string>
 				</dict>

diff --git a/Sources/iOS/Extensions/iMastTodayWidget/Base.lproj/MainInterface.storyboard b/Sources/iOS/Extensions/iMastTodayWidget/Base.lproj/MainInterface.storyboard
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="M4Y-Lb-cyx">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="M4Y-Lb-cyx">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -44,7 +40,7 @@
                                 <constraints>
                                     <constraint firstAttribute="width" constant="80" id="XKJ-rI-ga4"/>
                                 </constraints>
-                                <state key="normal" title="トゥート"/>
+                                <state key="normal" title="投稿"/>
                                 <connections>
                                     <action selector="tootButtonTapped:" destination="M4Y-Lb-cyx" eventType="touchUpInside" id="G4o-rD-wOV"/>
                                 </connections>
@@ -59,7 +55,7 @@
                                 <rect key="frame" x="260" y="30" width="20" height="20"/>
                             </activityIndicatorView>
                             <label opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="✓" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eXE-4f-7WU">
-                                <rect key="frame" x="262.5" y="29" width="15" height="21"/>
+                                <rect key="frame" x="262.5" y="29.5" width="15" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>

diff --git a/iMast.xcodeproj/project.pbxproj b/iMast.xcodeproj/project.pbxproj
@@ -629,6 +629,13 @@
 		CE6554DB23C25DE30084FE1D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CE6554DC23C25DE30084FE1D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/UserProfile.strings; sourceTree = "<group>"; };
 		CE6554E023C26C250084FE1D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/NewPost.strings; sourceTree = "<group>"; };
+		CE6554E223C2769B0084FE1D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NewPost.strings; sourceTree = "<group>"; };
+		CE6554E323C27A040084FE1D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		CE6554E423C27A040084FE1D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Notification.strings"; sourceTree = "<group>"; };
+		CE6554E523C27A040084FE1D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Login.strings"; sourceTree = "<group>"; };
+		CE6554E623C27A040084FE1D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/NewPost.strings"; sourceTree = "<group>"; };
+		CE6554E723C27A040084FE1D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Search.strings"; sourceTree = "<group>"; };
+		CE6554E823C27A040084FE1D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UserProfile.strings"; sourceTree = "<group>"; };
 		CE65772B21560BE300670F0A /* String+toPlainText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+toPlainText.swift"; sourceTree = "<group>"; };
 		CE66CE0F1EE976A7006D5B18 /* ShareAccountSelectorTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareAccountSelectorTableViewController.swift; sourceTree = "<group>"; };
 		CE66CE131EEA2AF9006D5B18 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
@@ -2208,6 +2215,7 @@
 				Base,
 				en,
 				ja,
+				"zh-Hans",
 			);
 			mainGroup = 2AF3520E1EAB9C5500777C2E;
 			productRefGroup = 2AF352181EAB9C5500777C2E /* Products */;
@@ -3136,6 +3144,7 @@
 			children = (
 				CE6554CA23C25DDC0084FE1D /* ja */,
 				CE6554DB23C25DE30084FE1D /* en */,
+				CE6554E323C27A040084FE1D /* zh-Hans */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -3145,6 +3154,7 @@
 			children = (
 				CE6554CC23C25DDC0084FE1D /* ja */,
 				CE6554D823C25DE20084FE1D /* en */,
+				CE6554E423C27A040084FE1D /* zh-Hans */,
 			);
 			name = Notification.strings;
 			sourceTree = "<group>";
@@ -3154,6 +3164,7 @@
 			children = (
 				CE6554CE23C25DDC0084FE1D /* ja */,
 				CE6554DA23C25DE30084FE1D /* en */,
+				CE6554E723C27A040084FE1D /* zh-Hans */,
 			);
 			name = Search.strings;
 			sourceTree = "<group>";
@@ -3163,6 +3174,7 @@
 			children = (
 				CE6554D023C25DDC0084FE1D /* ja */,
 				CE6554DC23C25DE30084FE1D /* en */,
+				CE6554E823C27A040084FE1D /* zh-Hans */,
 			);
 			name = UserProfile.strings;
 			sourceTree = "<group>";
@@ -3172,6 +3184,7 @@
 			children = (
 				CE6554D223C25DDC0084FE1D /* ja */,
 				CE6554D923C25DE20084FE1D /* en */,
+				CE6554E523C27A040084FE1D /* zh-Hans */,
 			);
 			name = Login.strings;
 			sourceTree = "<group>";
@@ -3180,6 +3193,8 @@
 			isa = PBXVariantGroup;
 			children = (
 				CE6554E023C26C250084FE1D /* ja */,
+				CE6554E223C2769B0084FE1D /* en */,
+				CE6554E623C27A040084FE1D /* zh-Hans */,
 			);
 			name = NewPost.strings;
 			sourceTree = "<group>";

diff --git a/iMast.xcodeproj/xcshareddata/xcschemes/iMast.xcscheme b/iMast.xcodeproj/xcshareddata/xcschemes/iMast.xcscheme
@@ -64,6 +64,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "zh-Hans"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"