From b79fd8e35a85784dfea55e0e98712f98de6c0892 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Tue, 10 May 2016 14:33:16 -0400 Subject: [PATCH 1/4] Update plist settings for 1.0 --- app/CPReflectionService/Info.plist | 4 ++-- app/CocoaPods/Base.lproj/CPHomeWindowController.xib | 6 +++--- app/CocoaPods/Supporting Files/Info.plist | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/CPReflectionService/Info.plist b/app/CPReflectionService/Info.plist index 9e6bf03d..976ae12b 100644 --- a/app/CPReflectionService/Info.plist +++ b/app/CPReflectionService/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.0.0.rc.1 + 1.0.0 CFBundleSignature ???? CFBundleVersion - 1.0.0.rc.1 + 1.0.0 NSHumanReadableCopyright Copyright © 2016 CocoaPods. All rights reserved. XPCService diff --git a/app/CocoaPods/Base.lproj/CPHomeWindowController.xib b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib index 50f3cd51..9b0f158f 100644 --- a/app/CocoaPods/Base.lproj/CPHomeWindowController.xib +++ b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib @@ -1,7 +1,7 @@ - + - + @@ -90,7 +90,7 @@ - + diff --git a/app/CocoaPods/Supporting Files/Info.plist b/app/CocoaPods/Supporting Files/Info.plist index db819fd3..b5323e43 100644 --- a/app/CocoaPods/Supporting Files/Info.plist +++ b/app/CocoaPods/Supporting Files/Info.plist @@ -56,7 +56,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0.rc.1 + 1.0.0 CFBundleSignature ???? CFBundleURLTypes @@ -73,7 +73,7 @@ CFBundleVersion - 1.0.0.rc.1 + 1.0.0 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright From 50d27cecd5613928cce99a832734eba306c78c84 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 11 May 2016 07:55:44 -0400 Subject: [PATCH 2/4] Fix localization issues --- app/CocoaPods/CPInstallPluginsViewController.swift | 3 ++- app/CocoaPods/Supporting Files/Localizable.strings | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/CocoaPods/CPInstallPluginsViewController.swift b/app/CocoaPods/CPInstallPluginsViewController.swift index 9d33b63e..c5337ae5 100644 --- a/app/CocoaPods/CPInstallPluginsViewController.swift +++ b/app/CocoaPods/CPInstallPluginsViewController.swift @@ -12,6 +12,7 @@ class CPInstallPluginsViewController: NSViewController, CPCLITaskDelegate { override func viewWillAppear() { super.viewWillAppear() + titleLabel.stringValue = ~"plugins installing message" let gems = pluginsToInstall.joinWithSeparator(" ") let command = "plugins install \(gems)" @@ -34,7 +35,7 @@ class CPInstallPluginsViewController: NSViewController, CPCLITaskDelegate { } else { exitButton.title = ~"Close" - titleLabel.stringValue = ~"Installed Plugins" + titleLabel.stringValue = ~"plugins all installed message" pluginsInstalled?() } } diff --git a/app/CocoaPods/Supporting Files/Localizable.strings b/app/CocoaPods/Supporting Files/Localizable.strings index dbb9ff85..15c6b9cf 100644 --- a/app/CocoaPods/Supporting Files/Localizable.strings +++ b/app/CocoaPods/Supporting Files/Localizable.strings @@ -42,6 +42,7 @@ "REPO_UPDATE_NOTIFICATION_TITLE" = "Repo Updated"; "REPO_UPDATE_FAILED_NOTIFICATION_TITLE" = "Repo not Updated"; +"PLUGINS_INSTALLING_MESSAGE" = "Installing Plugins"; "PLUGIN_FAILED_TO_INSTALL_MESSAGE" = "Failed to Install Plugins"; "PLUGINS_ALL_INSTALLED_MESSAGE" = "Installed Plugins"; From c1302e9167d10766a00b71b4340bbf2d3a39d21b Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 11 May 2016 08:07:12 -0400 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 5 +++++ Dangerfile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e343ad12..59b3cc95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ [orta](https://github.com/orta) [#314](https://github.com/CocoaPods/CocoaPods-app/pull/314) +* Fixes for localizations on the pod plugin install view controller + [orta](https://github.com/orta) + [#318](https://github.com/CocoaPods/CocoaPods-app/pull/318) + + ## [1.0.0.rc.1](https://github.com/CocoaPods/CocoaPods-app/releases/tag/1.0.0.rc.1) * Fixes to Sparkle updates, by returning to CocoaPods' version numbers diff --git a/Dangerfile b/Dangerfile index 8e485c9d..47ec1757 100644 --- a/Dangerfile +++ b/Dangerfile @@ -14,7 +14,7 @@ Here's an example of your CHANGELOG entry: ``` * #{pr.title} - [#{pr_author}](https://github.com/#{pr_author}) + [#{pr_author}](https://github.com/#{pr_author}) [##{pr.number}](https://github.com/#{pr.base.repo.full_name}/pull/#{pr.number}) ``` MARKDOWN From 449923089b96c18ad604d6d3337c436c53dd8ed4 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Wed, 11 May 2016 08:12:39 -0400 Subject: [PATCH 4/4] Make the 'install helper' help button 20px high instead of 21, making it look less bad on non-retina displays --- app/CocoaPods/Base.lproj/CPHomeWindowController.xib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/CocoaPods/Base.lproj/CPHomeWindowController.xib b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib index 9b0f158f..7c1a02d1 100644 --- a/app/CocoaPods/Base.lproj/CPHomeWindowController.xib +++ b/app/CocoaPods/Base.lproj/CPHomeWindowController.xib @@ -316,7 +316,7 @@ Command-Line Tools?