Skip to content
This repository has been archived by the owner on Nov 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #318 from CocoaPods/one_oh
Browse files Browse the repository at this point in the history
Fixes for localizations on the pod plugin install view controller
  • Loading branch information
orta committed May 11, 2016
2 parents 7fc03fd + 4499230 commit e31f6f7
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/CPReflectionService/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0.rc.1</string>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0.0.rc.1</string>
<string>1.0.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 CocoaPods. All rights reserved.</string>
<key>XPCService</key>
Expand Down
8 changes: 4 additions & 4 deletions app/CocoaPods/Base.lproj/CPHomeWindowController.xib
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F31a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="CPHomeWindowController">
Expand Down Expand Up @@ -90,7 +90,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="45" rowSizeStyle="automatic" viewBased="YES" id="xXw-3l-NGv" customClass="CPReturnTriggeringTableView" customModule="CocoaPods" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="234" height="328"/>
<rect key="frame" x="0.0" y="0.0" width="234" height="333"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
Expand Down Expand Up @@ -316,7 +316,7 @@ Command-Line Tools?</string>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dmd-73-Olf" customClass="CPBorderedButton">
<rect key="frame" x="403" y="428" width="60" height="21"/>
<rect key="frame" x="403" y="428" width="60" height="20"/>
<buttonCell key="cell" type="bevel" title="help" bezelStyle="regularSquare" image="TransparentButtonBG" imagePosition="overlaps" alignment="center" alternateImage="TransparentButtonBGFilled" imageScaling="axesIndependently" inset="2" id="a5U-pN-aXb" customClass="CPBorderedButtonCell">
<behavior key="behavior" lightByContents="YES"/>
<font key="font" metaFont="system"/>
Expand Down
3 changes: 2 additions & 1 deletion app/CocoaPods/CPInstallPluginsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -34,7 +35,7 @@ class CPInstallPluginsViewController: NSViewController, CPCLITaskDelegate {

} else {
exitButton.title = ~"Close"
titleLabel.stringValue = ~"Installed Plugins"
titleLabel.stringValue = ~"plugins all installed message"
pluginsInstalled?()
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/CocoaPods/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0.rc.1</string>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -73,7 +73,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.0.rc.1</string>
<string>1.0.0</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
1 change: 1 addition & 0 deletions app/CocoaPods/Supporting Files/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down

0 comments on commit e31f6f7

Please sign in to comment.