Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Localisation #659

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Localisation #659

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46c025e
use better location for the .lproj files and add (still empty) german…
schriftgestalt Jul 20, 2018
e5fe4c6
add target to update the english Localizable.strings
schriftgestalt Jul 20, 2018
5914da5
WIP: add NSLocalizedString macros
schriftgestalt Jul 20, 2018
a236c12
remove code signing info
schriftgestalt Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 English.lproj/InfoPlist.strings → ObjectiveGit/de.lproj/InfoPlist.strings
View file
Open in desktop
File renamed without changes.
90 changes: 90 additions & 0 deletions ObjectiveGit/de.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
/* No comment provided by engineer. */
"A filter named \"%@\" has already been registered" = "A filter named \"%@\" has already been registered";

/* error */
"Branch enumeration failed" = "Branch enumeration failed";

/* error */
"Branch lookup failed" = "Branch lookup failed";

/* No comment provided by engineer. */
"Could not create git index iterator." = "Could not create git index iterator.";

/* No comment provided by engineer. */
"Could not create status list." = "Could not create status list.";

/* No comment provided by engineer. */
"Could not iterate conflict." = "Could not iterate conflict.";

/* No comment provided by engineer. */
"Could not update index." = "Could not update index.";

/* error */
"Failed to clone repository from %@ to %@" = "Failed to clone repository from %1$@ to %2$@";

/* error */
"Failed to configure the server certificate at %@" = "Failed to configure the server certificate at %@";

/* error */
"Failed to create direct reference to %@" = "Failed to create direct reference to %@";

/* error */
"Failed to create symbolic reference to %@" = "Failed to create symbolic reference to %@";

/* error */
"Failed to delete remote." = "Failed to delete remote.";

/* error */
"Failed to enumerate tags" = "Failed to enumerate tags";

/* error */
"Failed to fetch from remote" = "Fetch von Remote ist fehlgeschlagen";

/* error */
"Failed to find merge base between commits %@ and %@." = "Failed to find merge base between commits %1$@ and %2$@.";

/* error */
"Failed to get config for repository." = "Failed to get config for repository.";

/* No comment provided by engineer. */
"Failed to get fetch refspecs for remote" = "Failed to get fetch refspecs for remote";

/* error */
"Failed to get HEAD%@" = "Failed to get HEAD%@";

/* error */
"Failed to get index for repository." = "Failed to get index for repository.";

/* error */
"Failed to initialize empty repository at URL %@." = "Failed to initialize empty repository at URL %@.";

/* error */
"Failed to list all references." = "Failed to list all references.";

/* error */
"Failed to list all remotes." = "Failed to list all remotes.";

/* error */
"Failed to look up submodule %@." = "Failed to look up submodule %@.";

/* error */
"Failed to lookup object" = "Failed to lookup object";

/* error */
"Failed to open repository at URL %@." = "Failed to open repository at URL %@.";

/* error */
"Failed to read prepared message." = "Failed to read prepared message.";

/* No comment provided by engineer. */
"Invalid file path URL to initialize repository." = "Invalid file path URL to initialize repository.";

/* No comment provided by engineer. */
"Invalid file path URL to open." = "Invalid file path URL to open.";

/* error */
"Revision specifier lookup failed." = "Revision specifier lookup failed.";

/* No comment provided by engineer. */
"Unregister the existing filter first." = "Unregister the existing filter first.";

2 changes: 2 additions & 0 deletions ObjectiveGit/en.lproj/InfoPlist.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* Localized versions of Info.plist keys */

90 changes: 90 additions & 0 deletions ObjectiveGit/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
/* No comment provided by engineer. */
"A filter named \"%@\" has already been registered" = "A filter named \"%@\" has already been registered";

/* error */
"Branch enumeration failed" = "Branch enumeration failed";

/* error */
"Branch lookup failed" = "Branch lookup failed";

/* No comment provided by engineer. */
"Could not create git index iterator." = "Could not create git index iterator.";

/* No comment provided by engineer. */
"Could not create status list." = "Could not create status list.";

/* No comment provided by engineer. */
"Could not iterate conflict." = "Could not iterate conflict.";

/* No comment provided by engineer. */
"Could not update index." = "Could not update index.";

/* error */
"Failed to clone repository from %@ to %@" = "Failed to clone repository from %1$@ to %2$@";

/* error */
"Failed to configure the server certificate at %@" = "Failed to configure the server certificate at %@";

/* error */
"Failed to create direct reference to %@" = "Failed to create direct reference to %@";

/* error */
"Failed to create symbolic reference to %@" = "Failed to create symbolic reference to %@";

/* error */
"Failed to delete remote." = "Failed to delete remote.";

/* error */
"Failed to enumerate tags" = "Failed to enumerate tags";

/* error */
"Failed to fetch from remote" = "Fetch von Remote ist fehlgeschlagen";

/* error */
"Failed to find merge base between commits %@ and %@." = "Failed to find merge base between commits %1$@ and %2$@.";

/* error */
"Failed to get config for repository." = "Failed to get config for repository.";

/* No comment provided by engineer. */
"Failed to get fetch refspecs for remote" = "Failed to get fetch refspecs for remote";

/* error */
"Failed to get HEAD%@" = "Failed to get HEAD%@";

/* error */
"Failed to get index for repository." = "Failed to get index for repository.";

/* error */
"Failed to initialize empty repository at URL %@." = "Failed to initialize empty repository at URL %@.";

/* error */
"Failed to list all references." = "Failed to list all references.";

/* error */
"Failed to list all remotes." = "Failed to list all remotes.";

/* error */
"Failed to look up submodule %@." = "Failed to look up submodule %@.";

/* error */
"Failed to lookup object" = "Failed to lookup object";

/* error */
"Failed to open repository at URL %@." = "Failed to open repository at URL %@.";

/* error */
"Failed to read prepared message." = "Failed to read prepared message.";

/* No comment provided by engineer. */
"Invalid file path URL to initialize repository." = "Invalid file path URL to initialize repository.";

/* No comment provided by engineer. */
"Invalid file path URL to open." = "Invalid file path URL to open.";

/* error */
"Revision specifier lookup failed." = "Revision specifier lookup failed.";

/* No comment provided by engineer. */
"Unregister the existing filter first." = "Unregister the existing filter first.";

100 changes: 95 additions & 5 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@
objects = {

/* Begin PBXAggregateTarget section */
562126272101D971009A787A /* genstrings */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 5621262C2101D971009A787A /* Build configuration list for PBXAggregateTarget "genstrings" */;
buildPhases = (
5621262D2101D978009A787A /* ShellScript */,
);
dependencies = (
);
name = genstrings;
productName = genstrings;
};
6A28265217C69CB400C6A948 /* OpenSSL-iOS */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 6A28265417C69CB400C6A948 /* Build configuration list for PBXAggregateTarget "OpenSSL-iOS" */;
Expand Down Expand Up @@ -105,6 +116,7 @@
55C8057A13875578004DCB0F /* NSString+Git.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C8057313874CDF004DCB0F /* NSString+Git.m */; };
55C8057D13875C11004DCB0F /* NSData+Git.h in Headers */ = {isa = PBXBuildFile; fileRef = BD6C2266131459E700992935 /* NSData+Git.h */; settings = {ATTRIBUTES = (Public, ); }; };
55C8057E13875C1B004DCB0F /* NSString+Git.h in Headers */ = {isa = PBXBuildFile; fileRef = 55C8057213874CDF004DCB0F /* NSString+Git.h */; settings = {ATTRIBUTES = (Public, ); }; };
562126302101DD06009A787A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5621262E2101DD06009A787A /* Localizable.strings */; };
5BE612881745EE3400266D8C /* GTTreeBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5BE612861745EE3300266D8C /* GTTreeBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
5BE6128A1745EE3400266D8C /* GTTreeBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BE612871745EE3300266D8C /* GTTreeBuilder.m */; };
5BE612931745EEBC00266D8C /* GTTreeBuilderSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BE612921745EEBC00266D8C /* GTTreeBuilderSpec.m */; };
Expand Down Expand Up @@ -454,7 +466,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = ObjectiveGit/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
200578C418932A82001C06C3 /* GTBlameSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlameSpec.m; sourceTree = "<group>"; };
2089E43B17D9A58000F451DA /* GTTagSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTagSpec.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -504,6 +516,8 @@
55C8054D13861F34004DCB0F /* GTObjectDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = GTObjectDatabase.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
55C8057213874CDF004DCB0F /* NSString+Git.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Git.h"; sourceTree = "<group>"; };
55C8057313874CDF004DCB0F /* NSString+Git.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Git.m"; sourceTree = "<group>"; };
5621262F2101DD06009A787A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ObjectiveGit/en.lproj/Localizable.strings; sourceTree = "<group>"; };
562126312101DD25009A787A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ObjectiveGit/de.lproj/Localizable.strings; sourceTree = "<group>"; };
5BE612861745EE3300266D8C /* GTTreeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTTreeBuilder.h; sourceTree = "<group>"; };
5BE612871745EE3300266D8C /* GTTreeBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTreeBuilder.m; sourceTree = "<group>"; };
5BE612921745EEBC00266D8C /* GTTreeBuilderSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTreeBuilderSpec.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -780,6 +794,7 @@
children = (
8DC2EF5A0486A6940098B216 /* Info.plist */,
089C1666FE841158C02AAC07 /* InfoPlist.strings */,
5621262E2101DD06009A787A /* Localizable.strings */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -1286,6 +1301,11 @@
LastUpgradeCheck = 0930;
ORGANIZATIONNAME = "GitHub, Inc";
TargetAttributes = {
562126272101D971009A787A = {
CreatedOnToolsVersion = 9.4.1;
DevelopmentTeam = X2L8375ZQ7;
ProvisioningStyle = Automatic;
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unwanted codesigning hunk.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed that. Thanks

88F05A6A16011E5400B7AD1D = {
LastSwiftMigration = 0830;
};
Expand All @@ -1307,11 +1327,10 @@
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
en,
ja,
fr,
de,
);
mainGroup = 0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
Expand All @@ -1326,6 +1345,7 @@
D0A330F216027F3600A616FA /* libgit2-iOS */,
6A28265217C69CB400C6A948 /* OpenSSL-iOS */,
6A3C609017D5963700382DFF /* libssh2-iOS */,
562126272101D971009A787A /* genstrings */,
);
};
/* End PBXProject section */
Expand All @@ -1344,6 +1364,7 @@
buildActionMask = 2147483647;
files = (
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
562126302101DD06009A787A /* Localizable.strings in Resources */,
F8D6384B207A618D00D1FD32 /* script in Resources */,
F81B6B55207B0A9F00AB0836 /* Mac-XCTest.xcconfig in Resources */,
);
Expand All @@ -1360,6 +1381,19 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
5621262D2101D978009A787A /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /usr/bin/python;
shellScript = "# encoding=utf-8\n\nimport os, time, codecs\nroot = os.getenv('SRCROOT')\nprint \"update localisation in\", root\nfor (dirpath, dirnames, filenames) in os.walk(root):\n if \"en.lproj\" in dirnames:\n os.chdir(dirpath)\n os.system(\"find ./ -name '*.mm' -o -name '*.m' | xargs genstrings -u -q -o en.lproj\")\n";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you split that into ./script/update-localization ? That would be ❤️, as that would save my soul from Xcode make it much easier to edit.

};
6A28265317C69CB400C6A948 /* OpenSSL-iOS */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1678,6 +1712,15 @@
name = InfoPlist.strings;
sourceTree = "<group>";
};
5621262E2101DD06009A787A /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
5621262F2101DD06009A787A /* en */,
562126312101DD25009A787A /* de */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -1817,6 +1860,42 @@
};
name = Release;
};
562126282101D971009A787A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X2L8375ZQ7;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
562126292101D971009A787A /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X2L8375ZQ7;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Test;
};
5621262A2101D971009A787A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X2L8375ZQ7;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
5621262B2101D971009A787A /* Profile */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X2L8375ZQ7;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Profile;
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hunk should be left out — that's codesigning configuration.

6A28265517C69CB400C6A948 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D81865174421EB00995A2E /* iOS-StaticLibrary.xcconfig */;
Expand Down Expand Up @@ -2481,6 +2560,17 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
5621262C2101D971009A787A /* Build configuration list for PBXAggregateTarget "genstrings" */ = {
isa = XCConfigurationList;
buildConfigurations = (
562126282101D971009A787A /* Debug */,
562126292101D971009A787A /* Test */,
5621262A2101D971009A787A /* Release */,
5621262B2101D971009A787A /* Profile */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
6A28265417C69CB400C6A948 /* Build configuration list for PBXAggregateTarget "OpenSSL-iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down