Skip to content

Commit e1f7c21

Browse files
author
Mincheol Kim
authored
Merge pull request #66 from Nexters/fix/qa
fix(tier-info, localization): 등급정보 수정, 권한 요청 다국어처리
2 parents ababdd4 + 62d1c67 commit e1f7c21

File tree

92 files changed

+224
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+224
-183
lines changed

Sticky.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
BB8292D425BD59A200077D8C /* LocationSearchService.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB8292D325BD59A200077D8C /* LocationSearchService.swift */; };
4444
BB85A2EC25DF5B6400532301 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BB85A2EB25DF5B6400532301 /* LaunchScreen.storyboard */; };
4545
BB85A30125DF67D300532301 /* ShareViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB85A30025DF67D300532301 /* ShareViewModel.swift */; };
46+
BB85A3E125E0A3AC00532301 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BB85A3E325E0A3AC00532301 /* InfoPlist.strings */; };
4647
BBAC0F3125C696B900FB81D7 /* LocationPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBAC0F3025C696B800FB81D7 /* LocationPermission.swift */; };
4748
BBB1EBF225AF3C2100F5EA37 /* StickyApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB1EBF125AF3C2100F5EA37 /* StickyApp.swift */; };
4849
BBB1EBF625AF3C2100F5EA37 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BBB1EBF525AF3C2100F5EA37 /* Assets.xcassets */; };
@@ -152,6 +153,9 @@
152153
BB8292D325BD59A200077D8C /* LocationSearchService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationSearchService.swift; sourceTree = "<group>"; };
153154
BB85A2EB25DF5B6400532301 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
154155
BB85A30025DF67D300532301 /* ShareViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewModel.swift; sourceTree = "<group>"; };
156+
BB85A3D525E0A31400532301 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
157+
BB85A3E225E0A3AC00532301 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
158+
BB85A3E725E0A3AD00532301 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
155159
BBAC0F3025C696B800FB81D7 /* LocationPermission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationPermission.swift; sourceTree = "<group>"; };
156160
BBB1EBEE25AF3C2100F5EA37 /* Sticky.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Sticky.app; sourceTree = BUILT_PRODUCTS_DIR; };
157161
BBB1EBF125AF3C2100F5EA37 /* StickyApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickyApp.swift; sourceTree = "<group>"; };
@@ -499,6 +503,7 @@
499503
EB63F51B25B8257C00151A05 /* Colors.xcassets */,
500504
BBB1EC5B25B079F700F5EA37 /* Localizable.strings */,
501505
BBB1EBFA25AF3C2100F5EA37 /* Info.plist */,
506+
BB85A3E325E0A3AC00532301 /* InfoPlist.strings */,
502507
BBB1EC6625B07B0A00F5EA37 /* String+localize.swift */,
503508
BBB1EC4A25B077E500F5EA37 /* Color.swift */,
504509
BBB1EBF725AF3C2100F5EA37 /* Preview Content */,
@@ -758,6 +763,7 @@
758763
buildActionMask = 2147483647;
759764
files = (
760765
BBB1EC5925B079F700F5EA37 /* Localizable.strings in Resources */,
766+
BB85A3E125E0A3AC00532301 /* InfoPlist.strings in Resources */,
761767
EB63F51C25B8257C00151A05 /* Colors.xcassets in Resources */,
762768
BB05AB7E25C6EE2400E34717 /* Modak.ttf in Resources */,
763769
BBB1EBF925AF3C2100F5EA37 /* Preview Assets.xcassets in Resources */,
@@ -945,10 +951,20 @@
945951
/* End PBXTargetDependency section */
946952

947953
/* Begin PBXVariantGroup section */
954+
BB85A3E325E0A3AC00532301 /* InfoPlist.strings */ = {
955+
isa = PBXVariantGroup;
956+
children = (
957+
BB85A3E225E0A3AC00532301 /* en */,
958+
BB85A3E725E0A3AD00532301 /* ko */,
959+
);
960+
name = InfoPlist.strings;
961+
sourceTree = "<group>";
962+
};
948963
BBB1EC5B25B079F700F5EA37 /* Localizable.strings */ = {
949964
isa = PBXVariantGroup;
950965
children = (
951966
BBB1EC5F25B07A2B00F5EA37 /* ko */,
967+
BB85A3D525E0A31400532301 /* en */,
952968
);
953969
name = Localizable.strings;
954970
sourceTree = "<group>";
8.63 KB
24.2 KB
45.9 KB

Sticky/Assets.xcassets/level/level1.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"images" : [
33
{
4-
"filename" : "level1.png",
4+
"filename" : "Class=Purple, Number=1@1x.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"filename" : "level1@2x.png",
9+
"filename" : "Class=Purple, Number=1@2x.png",
1010
"idiom" : "universal",
1111
"scale" : "2x"
1212
},
1313
{
14-
"filename" : "level1@3x.png",
14+
"filename" : "Class=Purple, Number=1@3x.png",
1515
"idiom" : "universal",
1616
"scale" : "3x"
1717
}
-6.67 KB
Binary file not shown.
-18 KB
Binary file not shown.
-33.1 KB
Binary file not shown.
6.61 KB
18 KB

0 commit comments

Comments
 (0)