github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-21 22:59:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Correct description for out of love badge (#8615)

Browse Source 
The bug mentioned here
https://meta.discourse.org/t/badge-not-triggering/135896/8

Basically, descriptions for 3 badges: "Out of Love", "Higher Love" and
"Crazy in Love" are granted based on on "max_likes_per_day" and the
description should reflect that.
This commit is contained in:
Krzysztof Kotlarek 2019-12-24 08:30:34 +11:00 committed by GitHub
parent 8c2e27790c
commit 9e4fcb1a0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/badge.rb
View File

@ -223,7 +223,7 @@ class Badge < ActiveRecord::Base
def long_description def long_description
key = "badges.#{i18n_name}.long_description" key = "badges.#{i18n_name}.long_description"
I18n.t(key, default: self[:long_description] || '', base_uri: Discourse.base_uri) I18n.t(key, default: self[:long_description] || '', base_uri: Discourse.base_uri, max_likes_per_day: SiteSetting.max_likes_per_day)
end end
def long_description=(val) def long_description=(val)
@ -233,7 +233,7 @@ class Badge < ActiveRecord::Base
def description def description
key = "badges.#{i18n_name}.description" key = "badges.#{i18n_name}.description"
I18n.t(key, default: self[:description] || '', base_uri: Discourse.base_uri) I18n.t(key, default: self[:description] || '', base_uri: Discourse.base_uri, max_likes_per_day: SiteSetting.max_likes_per_day)
end end
def description=(val) def description=(val)

10
config/locales/server.en.yml
View File

@ -4298,19 +4298,19 @@ en:
This badge is granted when you receive at least 5 likes on 300 different posts. Wow! The community admires your frequent, high quality contributions to the conversations here. This badge is granted when you receive at least 5 likes on 300 different posts. Wow! The community admires your frequent, high quality contributions to the conversations here.
out_of_love: out_of_love:
name: Out of Love name: Out of Love
description: Used 50 likes in a day description: Used %{max_likes_per_day} likes in a day
long_description: | long_description: |
This badge is granted when you use all 50 of your daily likes. Remembering to take a moment and like the posts you enjoy and appreciate encourages your fellow community members to create even more great discussions in the future. This badge is granted when you use all %{max_likes_per_day} of your daily likes. Remembering to take a moment and like the posts you enjoy and appreciate encourages your fellow community members to create even more great discussions in the future.
higher_love: higher_love:
name: Higher Love name: Higher Love
description: Used 50 likes in a day 5 times description: Used %{max_likes_per_day} likes in a day 5 times
long_description: | long_description: |
This badge is granted when you use all 50 of your daily likes for 5 days. Thanks for taking the time actively encouraging the best conversations every day! This badge is granted when you use all %{max_likes_per_day} of your daily likes for 5 days. Thanks for taking the time actively encouraging the best conversations every day!
crazy_in_love: crazy_in_love:
name: Crazy in Love name: Crazy in Love
description: Used 50 likes in a day 20 times description: Used 50 likes in a day 20 times
long_description: | long_description: |
This badge is granted when you use all 50 of your daily likes for 20 days. Wow! You’re a role model for encouraging your fellow community members! This badge is granted when you use all %{max_likes_per_day} of your daily likes for 20 days. Wow! You’re a role model for encouraging your fellow community members!
thank_you: thank_you:
name: Thank You name: Thank You
description: Has 20 liked posts and gave 10 likes description: Has 20 liked posts and gave 10 likes