Commit Graph

5858 Commits

Author SHA1 Message Date
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
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release
Release
2015-04-08 15:40:45 -04:00
Syed Hassan Raza
825aaed67f Split course's assests can access through '/' in asset url 2015-04-08 11:22:25 -04:00
Sarina Canelake
fc7b35c792 Merge pull request #7620 from louyihua/misc_i18n
Better i18n extraction and translation
2015-04-08 08:30:53 -04:00
louyihua
adc6929b45 Better i18n extraction and translation
1. Extract the full sentence rather than parital of a sentence, so that languages with different word orders than English can benifit from this.
2. Using ngettext instead of gettext with 'xxx(s)', as Transifex treats `()` as special characters so that it enforces the translated string must have the same number of `()` pairs. Such enforcement makes translations difficult, as not every language can use forms like 'xxx(s)' to represent both singular & plural within a single word.
2015-04-08 00:47:47 +08:00
Carol Tong
a854c727a7 Fix help token for Learn More button 2015-04-07 11:56:26 -04:00
louyihua
297d94a38b Make some strings i18n 2015-04-07 12:56:03 +08:00
louyihua
2d47f80391 Fix i18n breaking in some js and underscore files
1. Spliting strings inside the call to `gettext()` in javascript breaks the string extraction process, so the string should kept in one line.
2. Using escape string inside a string in `gettext()` may cause the extractor to misunderstand the escape string, so that it will escape this escape string.
2015-04-06 01:28:06 +08:00
Kelketek
5795ba3faf Merge pull request #7482 from open-craft/fix_duplicate_rcb
Fix duplication of Randomized Content Blocks
2015-04-03 12:50:09 -05:00
Nimisha Asthagiri
a204cacd74 Merge pull request #7561 from edx/mobile/PLAT-520
PLAT-520 Fix Asset store import of null values.
2015-04-03 12:46:21 -04:00
Nimisha Asthagiri
d9d4a007b9 PLAT-520 Fix Asset store import of null values 2015-04-03 11:39:51 -04:00
Sarina Canelake
40dc37dd0f Merge pull request #7563 from louyihua/translation_fix
Ignore pylint error 7610 (translation-of-non-string) on where it is intended
2015-04-03 08:47:36 -04:00
Awais Jibran
4ec713e968 Merge pull request #7554 from awaisdar001/aj/tnl473-fix-studio-container-bad-url
Fixed invalid `usage key` errors which previously throw 500.
2015-04-03 10:30:41 +05:00
louyihua
0d0d1a0ccd Ignore pylint error 7610 (translation-of-non-string) on where it is intended to do
As some i18n features need ```ugettext``` or its shorcut ```_``` to be called on a non-string-literal, so the pylint check of ```translation-of-non-string``` should be explicitly disabled in such situations.
2015-04-03 11:59:53 +08:00
Braden MacDonald
781634558e Improve the test to show a failure case 2015-04-03 01:59:02 +00:00
Jonathan Piacenti
fa95d323c6 Tested version handling, modified modulestore when it didn't work. 2015-04-02 21:41:27 +00:00
Jonathan Piacenti
51905f0cd5 Addressed notes for RCB duplication, removed management buttons from RCB container 2015-04-02 18:26:04 +00:00
Jonathan Piacenti
a6c00635b2 Fix issues with overrides on duplicated RCBs. 2015-04-02 18:23:28 +00:00
Greg Price
0e6ed88664 Merge pull request #7557 from edx/gprice/video-upload-imported
Add "Imported" state to Studio video upload page
2015-04-01 17:15:26 -04:00
Carol Tong
437d3229db Enhancements to Content Group and Experiment Group Config Sidebar Help 2015-04-01 13:53:14 -04:00
Greg Price
eafd12d8de Add "Imported" state to Studio video upload page
Imported VAL videos get the value "imported" for their status. We
considered not including imported videos on the upload page but have
instead decided to include them, so it is necessary to have a display
string for the imported status value.
2015-04-01 12:25:07 -04:00
Awais Jibran
5ad56d7a98 Used unicode for usage key. 2015-04-01 20:17:23 +05:00
Awais Jibran
e5d250bf50 Fixed invalid usage key errors which previously throw 500.
TNL-473
2015-04-01 16:13:30 +05:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val
Include VAL data in video module export/import
2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
2015-03-31 19:35:06 -04:00
Sarina Canelake
c1f3f558f2 Merge pull request #7524 from louyihua/underscore_extraction
Fix string extraction error in underscore files
2015-03-31 14:30:44 -04:00
louyihua
46342a3f48 Fix string extraction error in underscore files
The written style ```interpolate(gettext('some text'), {...}, ...)``` will will cause the string inside gettext() not be extracted.
So a separate line is needed for ```gettext``` when gettext function is directly called inside a call to the interpolate function.
2015-04-01 01:23:36 +08:00
Sarina Canelake
4a4478fd8b Merge pull request #7526 from delftswa2014/readmes
added READMEs for top level directories
2015-03-31 13:16:29 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical
Convert Vertical XModule to pure Vertical XBlock.
2015-03-31 11:10:22 -04:00
Mayank Jain
cf7777a474 added READMEs for top level directories 2015-03-31 16:47:37 +02:00
louyihua
2c75b5d725 Fix two missing replacements of {studio_name}
Located in ```howitworks.html``` and ```import.html```.
2015-03-31 13:04:54 +08:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
louyihua
9d3b65282e Fix error when STUDIO_NAME uses non-ascii characters
The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
2015-03-28 21:47:59 +08:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release
Release
2015-03-27 16:46:33 -04:00
Sarina Canelake
68ba17867f Merge pull request #7496 from open-craft/studio-display-name-consistency
Consistently use display_name_with_default in Studio
2015-03-27 14:57:22 -04:00
Clinton Blackburn
9a8ecc65a7 Removed invalid kwarg 2015-03-27 10:37:04 -04:00
Braden MacDonald
19bd7005e6 Consistently use display_name_with_default in Studio 2015-03-26 13:24:11 -07:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists.
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
2015-03-26 16:18:15 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77
Clee/ma 169 ma 77
2015-03-26 13:31:49 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release
Release
2015-03-26 12:56:41 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
2015-03-26 12:36:43 -04:00
Sarina Canelake
d66bb883ac Fix footer stylings for RTL 2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
8abfe4a850 Put Open edX logo in CMS footer 2015-03-26 10:14:37 -04:00
Adam Palay
43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) 2015-03-26 08:49:21 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
Eugeny Kolpakov
dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone
Unified Course Team and Library Users page. Converted both to Backbone.
2015-03-24 17:06:38 +03:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone.
Converted lettuce Course Team page tests to bok choy
2015-03-24 12:09:19 +03:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only
Add web-only setting to video module
2015-03-23 15:38:18 -04:00