titles & buttons

CatchChat · Aug 12, 2016 · 2569ac4 · 2569ac4
1 parent 480e87f
commit 2569ac4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/Yep/ViewControllers/AddFriends/AddFriendsViewController.swift b/Yep/ViewControllers/AddFriends/AddFriendsViewController.swift
@@ -24,7 +24,7 @@ final class AddFriendsViewController: SegueViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        title = NSLocalizedString("Add Friends", comment: "")
+        title = NSLocalizedString("title.add_friends", comment: "")
     }
 
     private var isFirstAppear: Bool = true

diff --git a/Yep/ViewControllers/EditSkills/EditSkillsViewController.swift b/Yep/ViewControllers/EditSkills/EditSkillsViewController.swift
@@ -62,7 +62,7 @@ final class EditSkillsViewController: BaseViewController {
 
         // add skills view
 
-        addSkillsView.title = NSLocalizedString("Add Skills", comment: "")
+        addSkillsView.title = NSLocalizedString("title.add_skills", comment: "")
 
         addSkillsView.tapAction = { [weak self] in
 

diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift
@@ -407,7 +407,7 @@ final class FeedsViewController: BaseViewController {
                 let predicate = NSPredicate(format: "skillID = %@", skillID)
                 let notInMaster = me.masterSkills.filter(predicate).count == 0
                 if notInMaster && me.learningSkills.filter(predicate).count == 0 {
-                    let addSkillToMeButton = UIBarButtonItem(title: NSLocalizedString("Add to Me", comment: ""), style: .Plain, target: self, action: #selector(FeedsViewController.addSkillToMe(_:)))
+                    let addSkillToMeButton = UIBarButtonItem(title: NSLocalizedString("button.add_skill_to_me", comment: ""), style: .Plain, target: self, action: #selector(FeedsViewController.addSkillToMe(_:)))
                     navigationItem.rightBarButtonItem = addSkillToMeButton
                 }
             }

diff --git a/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift b/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift
@@ -235,7 +235,7 @@ final class SkillHomeViewController: BaseViewController {
             let notInMaster = me.masterSkills.filter(predicate).count == 0
 
             if notInMaster && me.learningSkills.filter(predicate).count == 0 {
-                let addSkillToMeButton = UIBarButtonItem(title: NSLocalizedString("Add to Me", comment: ""), style: .Plain, target: self, action: #selector(SkillHomeViewController.addSkillToMe(_:)))
+                let addSkillToMeButton = UIBarButtonItem(title: NSLocalizedString("button.add_skill_to_me", comment: ""), style: .Plain, target: self, action: #selector(SkillHomeViewController.addSkillToMe(_:)))
                 navigationItem.rightBarButtonItem = addSkillToMeButton
             }
         }

diff --git a/Yep/Views/FriendRequest/FriendRequestView.swift b/Yep/Views/FriendRequest/FriendRequestView.swift
@@ -98,7 +98,7 @@ final class FriendRequestView: UIView {
 
     lazy var addButton: UIButton = {
         let button = self.baseButton()
-        button.setTitle(NSLocalizedString("Add", comment: ""), forState: .Normal)
+        button.setTitle(NSLocalizedString("button.add", comment: ""), forState: .Normal)
         button.backgroundColor = UIColor.yepTintColor()
         button.addTarget(self, action: #selector(FriendRequestView.tryAddAction), forControlEvents: .TouchUpInside)
         return button

diff --git a/Yep/en.lproj/Localizable.strings b/Yep/en.lproj/Localizable.strings
@@ -4,10 +4,10 @@
 "prompt.accept_friend_request_failed" = "Accept Friend Request failed!";
 "button.accept" = "Accept";
 "title.action" = "Action";
-"Add Friends" = "Add Friends";
-"Add Skills" = "Add Skills";
-"Add to Me" = "Add to Me";
-"Add" = "Add";
+"title.add_friends" = "Add Friends";
+"title.add_skills" = "Add Skills";
+"button.add_skill_to_me" = "Add to Me";
+"button.add" = "Add";
 "Added %@ to %@ successfully!" = "Added %1$@ to %2$@ successfully!";
 "Advertising" = "Advertising";
 "Albums" = "Albums";

diff --git a/Yep/zh-Hans.lproj/Localizable.strings b/Yep/zh-Hans.lproj/Localizable.strings
@@ -4,10 +4,10 @@
 "prompt.accept_friend_request_failed" = "接受好友请求失败！";
 "button.accept" = "接受";
 "title.action" = "操作";
-"Add Friends" = "添加好友";
-"Add Skills" = "添加技能";
-"Add to Me" = "添加此技能";
-"Add" = "添加";
+"title.add_friends" = "添加好友";
+"title.add_skills" = "添加技能";
+"button.add_skill_to_me" = "添加此技能";
+"button.add" = "添加";
 "Added %@ to %@ successfully!" = "已成功将“%1$@”添加到“%2$@”！";
 "Advertising" = "广告";
 "Albums" = "相册";