From 1d83d4dc0d4c61a6f8b4a04ab2ae74fd18c6d45c Mon Sep 17 00:00:00 2001
From: dcsjapan <dcsjapan@users.noreply.github.com>
Date: Fri, 23 Oct 2015 11:31:53 +0900
Subject: [PATCH 1/2] Reorganize key names for Likes

See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
- Adds a comment to indicate a pluralizable string.
- Supports https://github.com/flarum/likes/pull/3.
---
 .../lang-english/locale/flarum-likes.yml      | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml
index de5198ef2..8dc5ef37a 100644
--- a/extensions/lang-english/locale/flarum-likes.yml
+++ b/extensions/lang-english/locale/flarum-likes.yml
@@ -1,11 +1,36 @@
 flarum-likes:
+
+  ##
+  # UNIQUE KEYS - The following keys are used in only one location each.
+  ##
+
+  # Strings in this namespace are used by the admin interface.
+  admin:
+
+    # These strings are used in the Permissions page of the admin interface.
+    permissions:
+      like_posts_label: Like posts
+
+  # Strings in this namespace are used by the forum user interface.
   forum:
-    post_liked_notification: "{username} liked your post"
-    post_likes_modal_title: Users Who Like This
-    post_liked_by_self: "{users} like this."
-    post_liked_by: "{users} likes this.|{users} like this."
-    unlike_action: Unlike
-    like_action: Like
-    notify_post_liked: Someone likes my post
-    others: "{count} others"
-    you: You
+
+    # These strings are used by the Notifications dropdown, a.k.a. "the bell".
+    notifications:
+      post_liked_text: "{username} liked your post"
+
+    # These strings are displayed beneath individual posts.
+    post:
+      like_link: Like
+      liked_by_text: "{users} likes this.|{users} like this."
+      liked_by_self_text: "{users} like this."  # Can be pluralized to agree with the number of users!
+      others_link: "{count} others"
+      unlike_link: Unlike
+      you_text: You
+
+    # These strings are used by the Users Who Like This modal dialog.
+    post_likes:
+      title: Users Who Like This
+
+    # These strings are used in the Settings page.
+    settings:
+      notify_post_liked_label: Someone likes my post

From 9b70bee805f8766fc04a821e0c5df67be788c3df Mon Sep 17 00:00:00 2001
From: dcsjapan <dcsjapan@users.noreply.github.com>
Date: Fri, 23 Oct 2015 15:18:23 +0900
Subject: [PATCH 2/2] Modify the label for the notification preference setting

---
 extensions/lang-english/locale/flarum-likes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/lang-english/locale/flarum-likes.yml b/extensions/lang-english/locale/flarum-likes.yml
index 8dc5ef37a..9ab32e382 100644
--- a/extensions/lang-english/locale/flarum-likes.yml
+++ b/extensions/lang-english/locale/flarum-likes.yml
@@ -33,4 +33,4 @@ flarum-likes:
 
     # These strings are used in the Settings page.
     settings:
-      notify_post_liked_label: Someone likes my post
+      notify_post_liked_label: Someone likes one of my posts