github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-24 23:46:40 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

got to be careful with integrity specs

Browse Source
This commit is contained in:
Sam 2016-11-29 18:01:09 +11:00
parent 266322ce2e
commit b8dc58be90
3 changed files with 4 additions and 4 deletions

2
app/controllers/user_actions_controller.rb

@ -29,7 +29,7 @@ class UserActionsController < ApplicationController
if user.id == guardian.user.try(:id) if user.id == guardian.user.try(:id)
help_key += ".self" help_key += ".self"
else else
help_key += ".other" help_key += ".others"
end end
render json: { render json: {
user_action: [], user_action: [],

4
config/locales/server.en.yml

@ -602,10 +602,10 @@ en:
user_activity: user_activity:
no_bookmarks: no_bookmarks:
self: "You have no bookmarked posts, bookmarking posts allows you to easily access them later on." self: "You have no bookmarked posts, bookmarking posts allows you to easily access them later on."
other: "No bookmarks." others: "No bookmarks."
no_likes_given: no_likes_given:
self: "You have not liked any posts." self: "You have not liked any posts."
other: "No liked posts." others: "No liked posts."
topic_flag_types: topic_flag_types:
spam: spam:

2
spec/controllers/user_actions_controller_spec.rb

@ -43,7 +43,7 @@ describe UserActionsController do
expect(response.status).to eq(200) expect(response.status).to eq(200)
parsed = JSON.parse(response.body) parsed = JSON.parse(response.body)
expect(parsed["no_results_help"]).to eq(I18n.t("user_activity.no_bookmarks.other")) expect(parsed["no_results_help"]).to eq(I18n.t("user_activity.no_bookmarks.others"))
end end
context "queued posts" do context "queued posts" do