Skip to content

Commit 3d63159

Browse files
committed
Added localization for today widget, removed unused strings used by old libs
1 parent c7d53c9 commit 3d63159

12 files changed

Lines changed: 18 additions & 192 deletions

BitStore.xcodeproj/project.pbxproj

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
03AC8C71199511BE00E901E2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0358466E194F09A900521709 /* UIKit.framework */; };
2323
03AC8C77199511BE00E901E2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03AC8C75199511BE00E901E2 /* InfoPlist.strings */; };
2424
03CC5467197007F7000196ED /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03CC5453197007F7000196ED /* Localizable.strings */; };
25-
03CC5468197007F7000196ED /* LTHPasscodeViewController.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03CC5455197007F7000196ED /* LTHPasscodeViewController.strings */; };
26-
03CC5469197007F7000196ED /* AFNetworking.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03CC5457197007F7000196ED /* AFNetworking.strings */; };
2725
03CC546A197007F7000196ED /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03CC5459197007F7000196ED /* InfoPlist.strings */; };
2826
03F2E9B1194F0FD7007BE9A6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2E9B0194F0FD7007BE9A6 /* Security.framework */; };
2927
3362B7A08C86427D8B01F912 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DBA31FE505D94F7097170EA0 /* libPods.a */; };
@@ -95,6 +93,7 @@
9593
9A9D588319D1F73800EA940A /* SharedUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D588219D1F73800EA940A /* SharedUser.m */; };
9694
9A9D588419D1F8F200EA940A /* SharedUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D588219D1F73800EA940A /* SharedUser.m */; };
9795
9A9D588519D20FA700EA940A /* AccountActionButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ACA5B711969F037005C7BF8 /* AccountActionButton.m */; };
96+
9A9D588819D484C900EA940A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9A9D588A19D484C900EA940A /* Localizable.strings */; };
9897
9AA466BC1972D82A00A7B562 /* Color.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA466BB1972D82A00A7B562 /* Color.m */; };
9998
9AA6C44C1986FAFA0035A430 /* HTAutocompleteTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA6C44B1986FAFA0035A430 /* HTAutocompleteTextField.m */; };
10099
9AAAC41E19D092FE00994EB6 /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AAAC41D19D092FE00994EB6 /* NotificationCenter.framework */; };
@@ -179,16 +178,8 @@
179178
03AC8C7A199511BE00E901E2 /* BitStore Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BitStore Tests-Prefix.pch"; sourceTree = "<group>"; };
180179
03AC8C801995130000E901E2 /* libPods-CoreBitcoin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-CoreBitcoin.a"; path = "Pods/build/Debug-iphoneos/libPods-CoreBitcoin.a"; sourceTree = "<group>"; };
181180
03CC5454197007F7000196ED /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
182-
03CC5456197007F7000196ED /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LTHPasscodeViewController.strings; sourceTree = "<group>"; };
183-
03CC5458197007F7000196ED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AFNetworking.strings; sourceTree = "<group>"; };
184181
03CC545A197007F7000196ED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
185182
03CC545B197007F7000196ED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
186-
03CC545C197007F7000196ED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LTHPasscodeViewController.strings; sourceTree = "<group>"; };
187-
03CC545E197007F7000196ED /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LTHPasscodeViewController.strings; sourceTree = "<group>"; };
188-
03CC5460197007F7000196ED /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LTHPasscodeViewController.strings; sourceTree = "<group>"; };
189-
03CC5462197007F7000196ED /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/LTHPasscodeViewController.strings; sourceTree = "<group>"; };
190-
03CC5464197007F7000196ED /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/LTHPasscodeViewController.strings; sourceTree = "<group>"; };
191-
03CC5466197007F7000196ED /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LTHPasscodeViewController.strings"; sourceTree = "<group>"; };
192183
03F2E9B0194F0FD7007BE9A6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
193184
9A073F3D1996EDCD007E0D0F /* Order.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Order.h; sourceTree = "<group>"; };
194185
9A073F3E1996EDCD007E0D0F /* Order.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Order.m; sourceTree = "<group>"; };
@@ -325,6 +316,8 @@
325316
9A9D587E19D1778600EA940A /* BitStoreToday.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = BitStoreToday.entitlements; sourceTree = "<group>"; };
326317
9A9D588119D1F73800EA940A /* SharedUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedUser.h; sourceTree = "<group>"; };
327318
9A9D588219D1F73800EA940A /* SharedUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SharedUser.m; sourceTree = "<group>"; };
319+
9A9D588919D484C900EA940A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
320+
9A9D588B19D484CE00EA940A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
328321
9AA466BA1972D82A00A7B562 /* Color.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Color.h; sourceTree = "<group>"; };
329322
9AA466BB1972D82A00A7B562 /* Color.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Color.m; sourceTree = "<group>"; };
330323
9AA6C44A1986FAFA0035A430 /* HTAutocompleteTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTAutocompleteTextField.h; sourceTree = "<group>"; };
@@ -488,8 +481,6 @@
488481
isa = PBXGroup;
489482
children = (
490483
03CC5453197007F7000196ED /* Localizable.strings */,
491-
03CC5455197007F7000196ED /* LTHPasscodeViewController.strings */,
492-
03CC5457197007F7000196ED /* AFNetworking.strings */,
493484
03CC5459197007F7000196ED /* InfoPlist.strings */,
494485
);
495486
path = Localizable;
@@ -809,6 +800,7 @@
809800
children = (
810801
9AAAC42119D092FE00994EB6 /* Info.plist */,
811802
9A9D587C19D0D0AF00EA940A /* Images.xcassets */,
803+
9A9D588A19D484C900EA940A /* Localizable.strings */,
812804
);
813805
name = "Supporting Files";
814806
sourceTree = "<group>";
@@ -992,8 +984,6 @@
992984
03101B54198FCE6600E7FC5A /* Ringcaptcha.bundle in Resources */,
993985
03CC5467197007F7000196ED /* Localizable.strings in Resources */,
994986
9A67A76D1950D70A001FCE32 /* Images.xcassets in Resources */,
995-
03CC5469197007F7000196ED /* AFNetworking.strings in Resources */,
996-
03CC5468197007F7000196ED /* LTHPasscodeViewController.strings in Resources */,
997987
03CC546A197007F7000196ED /* InfoPlist.strings in Resources */,
998988
);
999989
runOnlyForDeploymentPostprocessing = 0;
@@ -1011,6 +1001,7 @@
10111001
buildActionMask = 2147483647;
10121002
files = (
10131003
9AAAC43119D0C97400994EB6 /* MainInterface.storyboard in Resources */,
1004+
9A9D588819D484C900EA940A /* Localizable.strings in Resources */,
10141005
9A9D587D19D0D0AF00EA940A /* Images.xcassets in Resources */,
10151006
);
10161007
runOnlyForDeploymentPostprocessing = 0;
@@ -1223,34 +1214,21 @@
12231214
name = Localizable.strings;
12241215
sourceTree = "<group>";
12251216
};
1226-
03CC5455197007F7000196ED /* LTHPasscodeViewController.strings */ = {
1227-
isa = PBXVariantGroup;
1228-
children = (
1229-
03CC5456197007F7000196ED /* de */,
1230-
03CC545C197007F7000196ED /* en */,
1231-
03CC545E197007F7000196ED /* es */,
1232-
03CC5460197007F7000196ED /* ja */,
1233-
03CC5462197007F7000196ED /* ko */,
1234-
03CC5464197007F7000196ED /* nl */,
1235-
03CC5466197007F7000196ED /* zh-Hans */,
1236-
);
1237-
name = LTHPasscodeViewController.strings;
1238-
sourceTree = "<group>";
1239-
};
1240-
03CC5457197007F7000196ED /* AFNetworking.strings */ = {
1217+
03CC5459197007F7000196ED /* InfoPlist.strings */ = {
12411218
isa = PBXVariantGroup;
12421219
children = (
1243-
03CC5458197007F7000196ED /* en */,
1220+
03CC545A197007F7000196ED /* en */,
12441221
);
1245-
name = AFNetworking.strings;
1222+
name = InfoPlist.strings;
12461223
sourceTree = "<group>";
12471224
};
1248-
03CC5459197007F7000196ED /* InfoPlist.strings */ = {
1225+
9A9D588A19D484C900EA940A /* Localizable.strings */ = {
12491226
isa = PBXVariantGroup;
12501227
children = (
1251-
03CC545A197007F7000196ED /* en */,
1228+
9A9D588919D484C900EA940A /* en */,
1229+
9A9D588B19D484CE00EA940A /* de */,
12521230
);
1253-
name = InfoPlist.strings;
1231+
name = Localizable.strings;
12541232
sourceTree = "<group>";
12551233
};
12561234
/* End PBXVariantGroup section */

BitStore/Localizable/de.lproj/LTHPasscodeViewController.strings

Lines changed: 0 additions & 26 deletions
This file was deleted.
-894 Bytes
Binary file not shown.

BitStore/Localizable/en.lproj/LTHPasscodeViewController.strings

Lines changed: 0 additions & 26 deletions
This file was deleted.

BitStore/Localizable/es.lproj/LTHPasscodeViewController.strings

Lines changed: 0 additions & 26 deletions
This file was deleted.

BitStore/Localizable/ja.lproj/LTHPasscodeViewController.strings

Lines changed: 0 additions & 26 deletions
This file was deleted.

BitStore/Localizable/ko.lproj/LTHPasscodeViewController.strings

Lines changed: 0 additions & 26 deletions
This file was deleted.

BitStore/Localizable/nl.lproj/LTHPasscodeViewController.strings

Lines changed: 0 additions & 26 deletions
This file was deleted.
-1014 Bytes
Binary file not shown.

BitStoreToday/TodayViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ - (void)viewWillAppear:(BOOL)animated {
4040
[self.view addSubview:_priceLabel];
4141

4242

43-
NSString* sendTitle = @"Send";
43+
NSString* sendTitle = NSLocalizedString(@"send", nil);
4444
AccountActionButton* sendButton = [[AccountActionButton alloc] initWithTitle:sendTitle image:[UIImage imageNamed:@"send"] selectedImage:[UIImage imageNamed:@"send_selected"]];
4545
sendButton.padding = 5;
4646
CGSize sendSize = [sendTitle sizeWithAttributes:@{NSFontAttributeName:sendButton.titleLabel.font}];
4747
sendButton.frame = CGRectMake(self.view.bounds.size.width - sendSize.width - 30, 25, sendSize.width, 50);
4848
[self.view addSubview:sendButton];
4949

5050

51-
NSString* receiveTitle = @"Receive";
51+
NSString* receiveTitle = NSLocalizedString(@"receive", nil);
5252
AccountActionButton* receiveButton = [[AccountActionButton alloc] initWithTitle:receiveTitle image:[UIImage imageNamed:@"receive"] selectedImage:[UIImage imageNamed:@"receive_selected"]];
5353
receiveButton.padding = 5;
5454
CGSize receiveSize = [receiveTitle sizeWithAttributes:@{NSFontAttributeName:receiveButton.titleLabel.font}];

0 commit comments

Comments
 (0)