v2.6.1

ZzzM · Jul 30, 2020 · 166d8a4 · 166d8a4
1 parent 7f20d2f
commit 166d8a4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/HostsToolForMac/HostsToolForMac.xcodeproj/project.pbxproj b/HostsToolForMac/HostsToolForMac.xcodeproj/project.pbxproj
@@ -445,12 +445,12 @@
 				CODE_SIGN_ENTITLEMENTS = HostsToolForMac/HostsToolForMac.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2.6.1;
 				DEVELOPMENT_TEAM = 7823BJG877;
 				INFOPLIST_FILE = HostsToolForMac/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ZzzM.HostsToolForMac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -466,12 +466,12 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2.6.1;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = HostsToolForMac/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = zzzm.mac.hostTool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/HostsToolForMac/HostsToolForMac/Info.plist b/HostsToolForMac/HostsToolForMac/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

diff --git a/HostsToolForMac/HostsToolForMac/Utils/Helper.swift b/HostsToolForMac/HostsToolForMac/Utils/Helper.swift
@@ -144,7 +144,7 @@ extension ExecutionResult {
         guard let error = errorDic,
             let message = error["NSAppleScriptErrorMessage"] as? String else {
                 return ExecutionResult
-                    .error("Hint.Script.Succeed".localized)
+                    .success("Succeed.Script.Execution".localized)
         }
 
         return ExecutionResult

diff --git a/HostsToolForMac/HostsToolForMac/en.lproj/Localizable.strings b/HostsToolForMac/HostsToolForMac/en.lproj/Localizable.strings
@@ -10,20 +10,17 @@
 "Menu.Title.Settings" = "Settings";
 "Menu.Title.Check" = "Check for Updates";
 "Menu.Title.Help" = "Help";
-
 "Menu.Title.Exit" = "Exit";
 
 "Settings.Title.Hosts" = "Download Options";
 "Settings.Title.View" = "View";
 
-"Alert.Title.Cancel" = "Cancel";
-"Alert.Title.Comfirm" = "Comfirm";
 
 "Error.Hosts.Invalid" = "Hosts is Invalid!";
 "Error.Hosts.Creation" = "Hosts Creation Failed:";
 
 "Error.Script.Compile" = "Script Failed To Compile!";
 "Error.Script.Execution" = "Script Execution Failed:";
 
-
+"Succeed.Script.Execution" = "Succeed！";
 
diff --git a/HostsToolForMac/HostsToolForMac/zh-Hans.lproj/Localizable.strings b/HostsToolForMac/HostsToolForMac/zh-Hans.lproj/Localizable.strings
@@ -12,19 +12,15 @@
 "Menu.Title.Help" = "帮助";
 "Menu.Title.Exit" = "退出";
 
-
 "Settings.Title.View" = "浏览";
 "Settings.Title.Hosts" = "下载配置";
 
-"Alert.Title.Cancel" = "取消";
-"Alert.Title.Comfirm" = "确认";
-
 "Error.Hosts.Invalid" = "无效的Hosts！";
 "Error.Hosts.Creation" = "Hosts创建失败！";
 
 "Error.Script.Compile" = "脚本编译失败!";
 "Error.Script.Execution" = "脚本执行失败:";
 
 
-
+"Succeed.Script.Execution" = "更新成功！";