Skip to content

Commit

Permalink
Merge pull request #14 from qwertyyb/develop
Browse files Browse the repository at this point in the history
fix: 修复本地化问题
  • Loading branch information
qwertyyb authored Oct 29, 2019
2 parents c544eea + f730d53 commit 59813de
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 441 deletions.
36 changes: 34 additions & 2 deletions YPaste.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
67136E302359E04F00EFB448 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 67136E322359E04F00EFB448 /* Preferences.xib */; };
67446E7A235F3EAE0050AB96 /* HotkeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67446E79235F3EAE0050AB96 /* HotkeyHandler.swift */; };
67784476235F376800970786 /* PasteboardHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67784475235F376800970786 /* PasteboardHandler.swift */; };
678C62AF23680DB10036A81A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 678C62B123680DB10036A81A /* Localizable.strings */; };
67904080235D8C1D00B0C74E /* PasteItemsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6790407F235D8C1D00B0C74E /* PasteItemsController.swift */; };
67C3262C2359D86300248CDE /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67C3262B2359D86300248CDE /* PreferencesWindowController.swift */; };
67C640E2235DE41D00649FD3 /* ScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67C640E1235DE41D00649FD3 /* ScrollView.swift */; };
Expand Down Expand Up @@ -61,6 +62,7 @@
67136E372359E66C00EFB448 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Preferences.strings"; sourceTree = "<group>"; };
67446E79235F3EAE0050AB96 /* HotkeyHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HotkeyHandler.swift; sourceTree = "<group>"; };
67784475235F376800970786 /* PasteboardHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardHandler.swift; sourceTree = "<group>"; };
678C62B023680DB10036A81A /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
6790407F235D8C1D00B0C74E /* PasteItemsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteItemsController.swift; sourceTree = "<group>"; };
67C3262B2359D86300248CDE /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
67C640E1235DE41D00649FD3 /* ScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -128,6 +130,7 @@
4596AE46232025A700F63EBF /* YPaste */ = {
isa = PBXGroup;
children = (
678C62B123680DB10036A81A /* Localizable.strings */,
67096211235EC0B0009068B9 /* Window */,
4596AE47232025A700F63EBF /* AppDelegate.swift */,
4596AE4E232025A800F63EBF /* Assets.xcassets */,
Expand Down Expand Up @@ -184,11 +187,12 @@
buildConfigurationList = 4596AE57232025A800F63EBF /* Build configuration list for PBXNativeTarget "YPaste" */;
buildPhases = (
CA29C5B8D0777403973216CA /* [CP] Check Pods Manifest.lock */,
678C62AC23680A190036A81A /* bartycrouch */,
4596AE40232025A700F63EBF /* Sources */,
4596AE41232025A700F63EBF /* Frameworks */,
4596AE42232025A700F63EBF /* Resources */,
3F3099D1713A8269175D3708 /* [CP] Embed Pods Frameworks */,
45B27B312345C92000A06A94 /* ShellScript */,
45B27B312345C92000A06A94 /* update version */,
);
buildRules = (
);
Expand Down Expand Up @@ -269,6 +273,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
678C62AF23680DB10036A81A /* Localizable.strings in Resources */,
67CFA4872351F4FB0058CF29 /* README.md in Resources */,
4596AE4F232025A800F63EBF /* Assets.xcassets in Resources */,
67136E302359E04F00EFB448 /* Preferences.xib in Resources */,
Expand Down Expand Up @@ -325,7 +330,7 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YPaste/Pods-YPaste-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
45B27B312345C92000A06A94 /* ShellScript */ = {
45B27B312345C92000A06A94 /* update version */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -334,6 +339,7 @@
);
inputPaths = (
);
name = "update version";
outputFileListPaths = (
);
outputPaths = (
Expand All @@ -342,6 +348,24 @@
shellPath = /bin/sh;
shellScript = "version=`/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" $PRODUCT_SETTINGS_PATH`\nversion=`expr $version + 1`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $version\" $PRODUCT_SETTINGS_PATH\n";
};
678C62AC23680A190036A81A /* bartycrouch */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = bartycrouch;
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif which bartycrouch > /dev/null; then\n bartycrouch update -x\n bartycrouch lint -x\nelse\n echo \"warning: BartyCrouch not installed, download it from https://github.com/Flinesoft/BartyCrouch\"\nfi\n";
};
CA29C5B8D0777403973216CA /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -424,6 +448,14 @@
name = Preferences.xib;
sourceTree = "<group>";
};
678C62B123680DB10036A81A /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
678C62B023680DB10036A81A /* zh-Hans */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down
2 changes: 1 addition & 1 deletion YPaste/Base.lproj/Preferences.xib
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" fixedFrame="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZLM-rR-dFA">
<rect key="frame" x="23" y="29" width="194" height="21"/>
<rect key="frame" x="32" y="30" width="194" height="21"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rez-PF-6eu" userLabel="Favorite Hot Key">
<rect key="frame" x="-2" y="5" width="104" height="16"/>
Expand Down
2 changes: 1 addition & 1 deletion YPaste/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>Explosion v0.1.8</string>
<key>CFBundleVersion</key>
<string>100646</string>
<string>100659</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
Loading

0 comments on commit 59813de

Please sign in to comment.