From a2108bbb514b36e2454fa1c28cf0f35edd00bbbf Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Sun, 16 Aug 2015 00:50:43 +0500 Subject: [PATCH 1/3] Enable html rendering for 2 locale strings Strings dreimQuote and teamSample3 on the front page contain symbol codes `…` and `’` which are not shown correctly Closes #5571 --- website/views/static/front.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/static/front.jade b/website/views/static/front.jade index a377ea0fe7..d1df63af4c 100644 --- a/website/views/static/front.jade +++ b/website/views/static/front.jade @@ -281,7 +281,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') .task-btn(style='display: inline-block; width: 1.62765em; height: 1.62765em; padding: 0px; margin:0px; line-height: 1.62765; text-align: center; color: rgb(34, 34, 34); float:left; cursor: pointer; vertical-align: top; left:0px; position:relative; background-color: rgb(220, 93, 93); border-right: 1px solid rgba(0, 0, 0, 0.25);') span(style='padding: 0.5em 0px 0em 0em; color: #666;') ☐ |   - .task-desc(style='display: inline-block; font-family: Lato,sans-serif; padding: 0.6em 0px 0em 1em; letter-spacing: normal; float:left; word-wrap: break-word;')= env.t('teamSample3') + .task-desc(style='display: inline-block; font-family: Lato,sans-serif; padding: 0.6em 0px 0em 1em; letter-spacing: normal; float:left; word-wrap: break-word;')!= env.t('teamSample3') br img.sample-img.visible-lg-inline-block(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/uses/publicSpaces.png') .usetweet-groups.col-lg-5.col-md-6.visible-lg-inline-block.visible-md-inline-block @@ -333,7 +333,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') .usetweet.tweet.popover.right .arrow .popover-content - = env.t('dreimQuote') + != env.t('dreimQuote') // End Item .item.improvement-use h3= env.t('goals') From 0a0d41510ebd3c212980830f16d2b18d8fc0de0d Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Sun, 16 Aug 2015 14:08:58 +0500 Subject: [PATCH 2/3] Revert "Enable html rendering for 2 locale strings" This reverts commit a2108bbb514b36e2454fa1c28cf0f35edd00bbbf. --- website/views/static/front.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/static/front.jade b/website/views/static/front.jade index d1df63af4c..a377ea0fe7 100644 --- a/website/views/static/front.jade +++ b/website/views/static/front.jade @@ -281,7 +281,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') .task-btn(style='display: inline-block; width: 1.62765em; height: 1.62765em; padding: 0px; margin:0px; line-height: 1.62765; text-align: center; color: rgb(34, 34, 34); float:left; cursor: pointer; vertical-align: top; left:0px; position:relative; background-color: rgb(220, 93, 93); border-right: 1px solid rgba(0, 0, 0, 0.25);') span(style='padding: 0.5em 0px 0em 0em; color: #666;') ☐ |   - .task-desc(style='display: inline-block; font-family: Lato,sans-serif; padding: 0.6em 0px 0em 1em; letter-spacing: normal; float:left; word-wrap: break-word;')!= env.t('teamSample3') + .task-desc(style='display: inline-block; font-family: Lato,sans-serif; padding: 0.6em 0px 0em 1em; letter-spacing: normal; float:left; word-wrap: break-word;')= env.t('teamSample3') br img.sample-img.visible-lg-inline-block(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/uses/publicSpaces.png') .usetweet-groups.col-lg-5.col-md-6.visible-lg-inline-block.visible-md-inline-block @@ -333,7 +333,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') .usetweet.tweet.popover.right .arrow .popover-content - != env.t('dreimQuote') + = env.t('dreimQuote') // End Item .item.improvement-use h3= env.t('goals') From a1f80355153c5671e75a944e5a7ac4454ae7820e Mon Sep 17 00:00:00 2001 From: GihHubSphinx Date: Sun, 16 Aug 2015 14:17:26 +0500 Subject: [PATCH 3/3] Change 2 strings to exclude html character codes exclude mldr and rsquo character codes not shown correctly on the front page --- common/locales/en/front.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/locales/en/front.json b/common/locales/en/front.json index 6f611efa85..8acbf7f00d 100644 --- a/common/locales/en/front.json +++ b/common/locales/en/front.json @@ -34,7 +34,7 @@ "companyVideos": "Videos", "contribUse": "Habitica contributors use", "dragonsilverQuote": "I can't tell you how many time and task tracking systems I've tried over the decades... [Habitica] is the only thing I've used that actually helps me get things done rather than just list them.", - "dreimQuote": "When I discovered [Habitica] last summer, I had just failed about half of my exams. Thanks to the Dailies… I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.", + "dreimQuote": "When I discovered [Habitica] last summer, I had just failed about half of my exams. Thanks to the Dailies... I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.", "elmiQuote": "Every morning I'm looking forward to getting up so I can earn some gold!", "email": "Email", "emailNewPass": "Email New Password", @@ -160,7 +160,7 @@ "tasks": "Tasks", "teamSample1": "Outline Meeting Itinerary for Tuesday", "teamSample2": "Brainstorm Growth Hacking", - "teamSample3": "Discuss this week’s KPIs", + "teamSample3": "Discuss this week's KPIs", "teams": "Teams", "terms": "Terms and Conditions", "testimonialHeading": "What people say...",