From 0515c3376944996b8bd1c9fcc7a9ac5b3165fca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 3 Jul 2014 22:57:42 +0200 Subject: [PATCH] Use double quotes when embeding translations in JS Translations commonly include single quotes, which closes the JavaScript string unexpectedly. Closes #5055 --- Changelog.md | 1 + app/views/conversations/new.haml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 8235a9d8e..110ba9d10 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,7 @@ * Fix padding in user menu [#5047](https://github.com/diaspora/diaspora/pull/5047) * Fix self-XSS when renaming an aspect [#5048](https://github.com/diaspora/diaspora/pull/5048) * Fix live updating when renaming an aspect [#5049](https://github.com/diaspora/diaspora/pull/5049) +* Use double quotes when embedding translations into Javascript [#5055](https://github.com/diaspora/diaspora/issues/5055) ## Features * Port admin pages to bootstrap, polish user search results, allow accounts to be closed from the backend [#5046](https://github.com/diaspora/diaspora/pull/5046) diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml index 356fd1dd0..4d65275cd 100644 --- a/app/views/conversations/new.haml +++ b/app/views/conversations/new.haml @@ -19,7 +19,7 @@ minChars: 1, keyDelay: 0, startText: '', - emptyText: '#{t('no_results')}', + emptyText: "#{t('no_results')}", preFill: [{name : "#{h params[:name]}", value : "#{@contact_ids}"}] });