nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use double quotes when embeding translations in JS

Browse source 
Translations commonly include single quotes, which closes
the JavaScript string unexpectedly. Closes #5055
This commit is contained in:
Jonne Haß 2014-07-03 22:57:42 +02:00
parent e4246b6fdd
commit 0515c33769
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -9,6 +9,7 @@
* Fix padding in user menu [#5047](https://github.com/diaspora/diaspora/pull/5047) * 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 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) * 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 ## 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) * 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)

2
app/views/conversations/new.haml
View file

@ -19,7 +19,7 @@
minChars: 1, minChars: 1,
keyDelay: 0, keyDelay: 0,
startText: '', startText: '',
emptyText: '#{t('no_results')}', emptyText: "#{t('no_results')}",
preFill: [{name : "#{h params[:name]}", preFill: [{name : "#{h params[:name]}",
value : "#{@contact_ids}"}] value : "#{@contact_ids}"}]
}); });