Commit 326fb93e823ad0d86a6ac3595ecdb6d267b01b8f
Fix a couple of things based on hbett's code review:
* An error in the code comments * Use 'const' over let in some functions I introduced.Gordon Martin committed on 2/19/2018, 11:45:58 AM
Parent: 10d7179c91530bc339270652277e99f17716fc99
Files changed
| locales/en.json | changed |
| modules/page/html/render/public.js | changed |
| locales/en.json | ||
|---|---|---|
| @@ -102,6 +102,46 @@ | ||
| 102 | 102 | "%s people from your network replied to this message on ": { |
| 103 | 103 | "one": "%s people from your network replied to this message on ", |
| 104 | 104 | "other": "%s people from your network replied to this message on " |
| 105 | 105 | }, |
| 106 | - "unfollowed ": "unfollowed " | |
| 106 | + "unfollowed ": "unfollowed ", | |
| 107 | + "subscribed to ": "subscribed to ", | |
| 108 | + "Write a public message": "Write a public message", | |
| 109 | + "Click to unsubscribe": "Click to unsubscribe", | |
| 110 | + "Subscribed": "Subscribed", | |
| 111 | + "Subscribe": "Subscribe", | |
| 112 | + "You follow %s people that subscribe to this channel.": { | |
| 113 | + "one": "You follow %s people that subscribe to this channel.", | |
| 114 | + "other": "You follow %s people that subscribe to this channel." | |
| 115 | + }, | |
| 116 | + "Write a message in this channel": "Write a message in this channel", | |
| 117 | + "You may not be able to see new channel content until you follow some users or pubs.": "You may not be able to see new channel content until you follow some users or pubs.", | |
| 118 | + "mentioned this channel": "mentioned this channel", | |
| 119 | + " others": " others", | |
| 120 | + "Click to unblock": "Click to unblock", | |
| 121 | + "Blocked": "Blocked", | |
| 122 | + "Click to unfollow": "Click to unfollow", | |
| 123 | + "Follow Back": "Follow Back", | |
| 124 | + "Follow": "Follow", | |
| 125 | + "Click to block syncing with this person and hide their posts": "Click to block syncing with this person and hide their posts", | |
| 126 | + "Block": "Block", | |
| 127 | + "This is you.": "This is you.", | |
| 128 | + "assigned a display image to ": "assigned a display image to ", | |
| 129 | + "Close": "Close", | |
| 130 | + "self identifies as ": "self identifies as ", | |
| 131 | + "New Message": "New Message", | |
| 132 | + "Write a private reply": "Write a private reply", | |
| 133 | + "Write a public reply": "Write a public reply", | |
| 134 | + "self assigned a description": "self assigned a description", | |
| 135 | + "liked this message": "liked this message", | |
| 136 | + "Confirm": "Confirm", | |
| 137 | + "Cancel": "Cancel", | |
| 138 | + "self assigned a display image": "self assigned a display image", | |
| 139 | + "Search Results:": "Search Results:", | |
| 140 | + "Search completed.": "Search completed.", | |
| 141 | + "result found": "result found", | |
| 142 | + "results found": "results found", | |
| 143 | + "Unread Message": "Unread Message", | |
| 144 | + " forked this discussion:": " forked this discussion:", | |
| 145 | + "on ": "on ", | |
| 146 | + "External Link": "External Link" | |
| 107 | 147 | } |
| modules/page/html/render/public.js | ||
|---|---|---|
| @@ -264,27 +264,27 @@ | ||
| 264 | 264 | ] |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | function noVisibleNewPostsWarning () { |
| 268 | - var explanation = i18n('You may not be able to see new content until you follow some users or pubs.') | |
| 268 | + const explanation = i18n('You may not be able to see new content until you follow some users or pubs.') | |
| 269 | 269 | |
| 270 | - var shownWhen = computed([loading, contact.isNotFollowingAnybody], | |
| 270 | + const shownWhen = computed([loading, contact.isNotFollowingAnybody], | |
| 271 | 271 | (isLoading, isNotFollowingAnybody) => !isLoading && isNotFollowingAnybody |
| 272 | 272 | ) |
| 273 | 273 | |
| 274 | 274 | return api.feed.html.followWarning(shownWhen, explanation) |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | function noFollowersWarning () { |
| 278 | - var explanation = i18n( | |
| 278 | + const explanation = i18n( | |
| 279 | 279 | 'Nobody will be able to see your posts until you have a follower. The easiest way to get a follower is to use a pub invite as the pub will follow you back. If you have already redeemed a pub invite and you see it has not followed you back on your profile, try another pub.' |
| 280 | 280 | ) |
| 281 | 281 | |
| 282 | - // We only show this if the user has followed someone as the first warning ('you are not followed anyone') | |
| 282 | + // We only show this if the user has followed someone as the first warning ('You are not following anyone') | |
| 283 | 283 | // should be sufficient to get the user to join a pub. However, pubs have been buggy and not followed back on occassion. |
| 284 | 284 | // Additionally, someone onboarded on a local network might follow someone on the network, but not be followed back by |
| 285 | 285 | // them, so we begin to show this warning if the user has followed someone, but has no followers. |
| 286 | - var shownWhen = computed([loading, contact.hasNoFollowers, contact.isNotFollowingAnybody], | |
| 286 | + const shownWhen = computed([loading, contact.hasNoFollowers, contact.isNotFollowingAnybody], | |
| 287 | 287 | (isLoading, hasNoFollowers, isNotFollowingAnybody) => |
| 288 | 288 | !isLoading && (hasNoFollowers && !isNotFollowingAnybody) |
| 289 | 289 | ) |
| 290 | 290 | |
Built with git-ssb-web