From b8dc58be9073abb06ef633d1838f18ac6225d68a Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 29 Nov 2016 18:01:09 +1100 Subject: [PATCH] got to be careful with integrity specs --- app/controllers/user_actions_controller.rb | 2 +- config/locales/server.en.yml | 4 ++-- spec/controllers/user_actions_controller_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb index fea9ec4183f..71dd2a5a129 100644 --- a/app/controllers/user_actions_controller.rb +++ b/app/controllers/user_actions_controller.rb @@ -29,7 +29,7 @@ class UserActionsController < ApplicationController if user.id == guardian.user.try(:id) help_key += ".self" else - help_key += ".other" + help_key += ".others" end render json: { user_action: [], diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 09e54a10602..bf472741990 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -602,10 +602,10 @@ en: user_activity: no_bookmarks: 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: self: "You have not liked any posts." - other: "No liked posts." + others: "No liked posts." topic_flag_types: spam: diff --git a/spec/controllers/user_actions_controller_spec.rb b/spec/controllers/user_actions_controller_spec.rb index ca0c0df4a5c..52583c7f86a 100644 --- a/spec/controllers/user_actions_controller_spec.rb +++ b/spec/controllers/user_actions_controller_spec.rb @@ -43,7 +43,7 @@ describe UserActionsController do expect(response.status).to eq(200) 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 context "queued posts" do