Commit Graph

16 Commits

Author SHA1 Message Date
Daniel Friedman
56b1196246 Fix accidental extra escaping 2016-03-23 14:46:35 -04:00
Daniel Friedman
48e2299e47 Make CMS activation_invalid template safe by default 2016-03-23 11:21:50 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links.
TNL-2695
2015-09-17 16:30:40 -04:00
louyihua
7a45d6e471 i18n fix in studio
1. Fix the broken `gettext()` call in `courde_detail.js`
2. Change the string to avoid Transifex misunderstand the pattern '% o' in `checklist.underscore`.
3. Embed the `{filename}` part inside the string in `transcripts-choose.underscore` to provide better i18n flexibililty.
4. Remove all the call of `gettext()` and `${_()}` inside the `mock` directory to aovid mis-extraction by pybabel. (It seems that the `mock` directory is soly used in test? So the strings in this directory need not to be extracted and translated?)
5. The unicode char `\u2014` will trigger a bug inside pybabel which makes the extracted string untranslatable, so remove this char.
2015-04-13 19:00:52 +08:00
David Baumgold
d00c3d0deb Tender is only accessible via HTTP, not HTTPS 2015-01-28 18:23:22 -05:00
David Baumgold
4d323271ee Make Tender optional and configurable 2015-01-14 11:25:55 -05:00
David Baumgold
34c6415527 Use STUDIO_SHORT_NAME for Studio
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
2014-12-23 11:14:58 -05:00
David Baumgold
7366d2b1a2 Replace "edX Studio" with "{studio_name}"
For theming and internationalization
2014-12-19 13:58:42 -05:00
David Baumgold
e8d62ff6a8 Replace — with literal emdash 2014-12-12 11:09:26 -05:00
David Baumgold
1fe72d89bf Double quotes for i18n string 2014-12-12 09:44:21 -05:00
David Baumgold
71a74c41c7 Don't break up i18n string 2014-12-12 09:43:27 -05:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
2013-07-22 12:15:42 -04:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Brian Talbot
b4457371a8 Studio: revises and syncs up activation message UI with dashboard UI 2013-07-11 14:53:22 -04:00
Victor Shnayder
5609ca6e2b remove empty marketing template 2012-07-16 13:34:05 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms.
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
2012-07-13 11:51:32 -04:00