Skip to content

Commit c19038a

Browse files
odrobnikodrobnik
committed
Merge branch 'od/issue_7' into develop
2 parents 67e9c49 + 37c1ea8 commit c19038a

File tree

4 files changed

+39
-20
lines changed

4 files changed

+39
-20
lines changed

‎Core/Source/DTLocalizableStringScanner.m‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,15 +288,21 @@ - (NSString *)_scanParameter
288288
}
289289
else if (character == '"')
290290
{
291-
quotedString = [self _scanQuotedString];
291+
if (quotedString) {
292+
quotedString = [[quotedString substringToIndex:quotedString.length-1]
293+
stringByAppendingString:[[self _scanQuotedString] substringFromIndex:1]];
294+
}
295+
else {
296+
quotedString = [self _scanQuotedString];
297+
}
292298
}
293299
else
294300
{
295301
_currentIndex++;
296302
}
297303
}
298304

299-
if (quotedString)
305+
if (quotedString)
300306
{
301307
return quotedString;
302308
}

‎Core/Source/DTLocalizableStringsParser.m‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -615,17 +615,17 @@ - (void)_parseKeyAndLocalizedString:(NSString *)line key:(NSString **)key value:
615615

616616
- (void)setDelegate:(id<DTLocalizableStringsParserDelegate>)delegate
617617
{
618-
if (_delegate != delegate)
619-
{
620-
_delegate = delegate;
621-
622-
_delegateFlags.delegateSupportsDocumentStart = [_delegate respondsToSelector:@selector(parserDidStartDocument)];
623-
_delegateFlags.delegateSupportsDocumentEnd = [_delegate respondsToSelector:@selector(parserDidEndDocument)];
624-
_delegateFlags.delegateSupportsError = [_delegate respondsToSelector:@selector(parser:parseErrorOccurred:)];
625-
626-
_delegateFlags.delegateSupportsComment = [_delegate respondsToSelector:@selector(parser:foundComment:)];
627-
_delegateFlags.delegateSupportsKeyValue = [_delegate respondsToSelector:@selector(parser:foundKey:value:)];
628-
}
618+
if (_delegate != delegate)
619+
{
620+
_delegate = delegate;
621+
622+
_delegateFlags.delegateSupportsDocumentStart = [_delegate respondsToSelector:@selector(parserDidStartDocument:)];
623+
_delegateFlags.delegateSupportsDocumentEnd = [_delegate respondsToSelector:@selector(parserDidEndDocument:)];
624+
_delegateFlags.delegateSupportsError = [_delegate respondsToSelector:@selector(parser:parseErrorOccurred:)];
625+
626+
_delegateFlags.delegateSupportsComment = [_delegate respondsToSelector:@selector(parser:foundComment:)];
627+
_delegateFlags.delegateSupportsKeyValue = [_delegate respondsToSelector:@selector(parser:foundKey:value:)];
628+
}
629629
}
630630

631631
@synthesize delegate = _delegate;

‎Test/Resources/Multiple_Lines.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* Issue 7: A string can span multiple lines */
2+
3+
NSString *multiLine = NSLocalizedString(@"Here is one line!"
4+
"And another"
5+
"And yet another", @"Multiple Lines");
6+

‎genstrings2.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24+
A7313BD5190A4F72007E130F /* Multiple_Lines.txt in Resources */ = {isa = PBXBuildFile; fileRef = A7313BD4190A4F72007E130F /* Multiple_Lines.txt */; };
2425
A775234214ACEF7A0035CDCA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A775234114ACEF7A0035CDCA /* Foundation.framework */; };
2526
A79499AD14C0D35500A8CCDE /* NSPredicateEditor.txt in Resources */ = {isa = PBXBuildFile; fileRef = A79499AC14C0D35500A8CCDE /* NSPredicateEditor.txt */; };
2627
A79499CF14C3052500A8CCDE /* CustomPrefix.txt in Resources */ = {isa = PBXBuildFile; fileRef = A79499CE14C3052500A8CCDE /* CustomPrefix.txt */; };
@@ -69,6 +70,7 @@
6970
/* Begin PBXFileReference section */
7071
55951CFE14BD3C1700E4A63E /* DTLocalizableStringEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTLocalizableStringEntry.h; sourceTree = "<group>"; };
7172
55951CFF14BD3C1700E4A63E /* DTLocalizableStringEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTLocalizableStringEntry.m; sourceTree = "<group>"; };
73+
A7313BD4190A4F72007E130F /* Multiple_Lines.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Multiple_Lines.txt; sourceTree = "<group>"; };
7274
A775233D14ACEF7A0035CDCA /* genstrings2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = genstrings2; sourceTree = BUILT_PRODUCTS_DIR; };
7375
A775234114ACEF7A0035CDCA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
7476
A79499AC14C0D35500A8CCDE /* NSPredicateEditor.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NSPredicateEditor.txt; sourceTree = "<group>"; };
@@ -256,6 +258,7 @@
256258
A7F65DDA14C040D00092E2EE /* Resources */ = {
257259
isa = PBXGroup;
258260
children = (
261+
A7313BD4190A4F72007E130F /* Multiple_Lines.txt */,
259262
FA35A34E16DFA12A001CB74A /* Localizable.strings */,
260263
A79499CE14C3052500A8CCDE /* CustomPrefix.txt */,
261264
A79499D114C30B0300A8CCDE /* CustomPrefix.plist */,
@@ -357,7 +360,8 @@
357360
A775233414ACEF790035CDCA /* Project object */ = {
358361
isa = PBXProject;
359362
attributes = {
360-
LastUpgradeCheck = 0460;
363+
LastTestingUpgradeCheck = 0510;
364+
LastUpgradeCheck = 0510;
361365
ORGANIZATIONNAME = "Drobnik KG";
362366
};
363367
buildConfigurationList = A775233714ACEF790035CDCA /* Build configuration list for PBXProject "genstrings2" */;
@@ -385,6 +389,7 @@
385389
isa = PBXResourcesBuildPhase;
386390
buildActionMask = 2147483647;
387391
files = (
392+
A7313BD5190A4F72007E130F /* Multiple_Lines.txt in Resources */,
388393
A7F65DDC14C040D00092E2EE /* Testcases.txt in Resources */,
389394
A7F65DE214C043850092E2EE /* Slashes_and_Quotes.txt in Resources */,
390395
A7F65DEB14C067990092E2EE /* Multiple_Tables.txt in Resources */,
@@ -468,9 +473,10 @@
468473
isa = XCBuildConfiguration;
469474
buildSettings = {
470475
ALWAYS_SEARCH_USER_PATHS = NO;
471-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
472476
CLANG_ENABLE_OBJC_ARC = YES;
477+
CLANG_WARN_BOOL_CONVERSION = YES;
473478
CLANG_WARN_CONSTANT_CONVERSION = YES;
479+
CLANG_WARN_EMPTY_BODY = YES;
474480
CLANG_WARN_ENUM_CONVERSION = YES;
475481
CLANG_WARN_INT_CONVERSION = YES;
476482
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -488,7 +494,9 @@
488494
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
489495
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
490496
GCC_WARN_ABOUT_RETURN_TYPE = YES;
497+
GCC_WARN_UNDECLARED_SELECTOR = YES;
491498
GCC_WARN_UNINITIALIZED_AUTOS = YES;
499+
GCC_WARN_UNUSED_FUNCTION = YES;
492500
GCC_WARN_UNUSED_VARIABLE = YES;
493501
MACOSX_DEPLOYMENT_TARGET = 10.7;
494502
ONLY_ACTIVE_ARCH = YES;
@@ -500,9 +508,10 @@
500508
isa = XCBuildConfiguration;
501509
buildSettings = {
502510
ALWAYS_SEARCH_USER_PATHS = NO;
503-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
504511
CLANG_ENABLE_OBJC_ARC = YES;
512+
CLANG_WARN_BOOL_CONVERSION = YES;
505513
CLANG_WARN_CONSTANT_CONVERSION = YES;
514+
CLANG_WARN_EMPTY_BODY = YES;
506515
CLANG_WARN_ENUM_CONVERSION = YES;
507516
CLANG_WARN_INT_CONVERSION = YES;
508517
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -514,7 +523,9 @@
514523
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
515524
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
516525
GCC_WARN_ABOUT_RETURN_TYPE = YES;
526+
GCC_WARN_UNDECLARED_SELECTOR = YES;
517527
GCC_WARN_UNINITIALIZED_AUTOS = YES;
528+
GCC_WARN_UNUSED_FUNCTION = YES;
518529
GCC_WARN_UNUSED_VARIABLE = YES;
519530
MACOSX_DEPLOYMENT_TARGET = 10.7;
520531
SDKROOT = macosx;
@@ -524,7 +535,6 @@
524535
A775234D14ACEF7A0035CDCA /* Debug */ = {
525536
isa = XCBuildConfiguration;
526537
buildSettings = {
527-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
528538
GCC_PRECOMPILE_PREFIX_HEADER = YES;
529539
GCC_PREFIX_HEADER = "Demo/genstrings2-Prefix.pch";
530540
OTHER_LDFLAGS = (
@@ -538,7 +548,6 @@
538548
A775234E14ACEF7A0035CDCA /* Release */ = {
539549
isa = XCBuildConfiguration;
540550
buildSettings = {
541-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
542551
GCC_PRECOMPILE_PREFIX_HEADER = YES;
543552
GCC_PREFIX_HEADER = "Demo/genstrings2-Prefix.pch";
544553
OTHER_LDFLAGS = (
@@ -552,7 +561,6 @@
552561
A79AC09614B1A51800489FA3 /* Debug */ = {
553562
isa = XCBuildConfiguration;
554563
buildSettings = {
555-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
556564
CLANG_ENABLE_OBJC_ARC = YES;
557565
COMBINE_HIDPI_IMAGES = YES;
558566
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -565,7 +573,6 @@
565573
A79AC09714B1A51800489FA3 /* Release */ = {
566574
isa = XCBuildConfiguration;
567575
buildSettings = {
568-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
569576
CLANG_ENABLE_OBJC_ARC = YES;
570577
COMBINE_HIDPI_IMAGES = YES;
571578
GCC_PRECOMPILE_PREFIX_HEADER = YES;

0 commit comments

Comments
 (0)