Commit Graph

10032 Commits

Author SHA1 Message Date
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations
-added i18n for plupload
2012-11-22 14:37:54 -05:00
denise 9a1a7b2e97 CC-1960: Internationalize Airtime / Support translations
-added locale directory structure under airtime_mvc
2012-11-22 11:09:24 -05:00
denise c0e49b69e2 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-21 17:17:53 -05:00
denise 2172ee82d3 Merge branch '2.2.x' into devel 2012-11-21 17:17:32 -05:00
denise caa1998e77 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-21 17:17:12 -05:00
denise 993d3fda7b CC-1960: Internationalize Airtime / Support translations
-set locale based on user's preference
2012-11-21 16:41:54 -05:00
denise 2a4e4c6405 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
-fixed
2012-11-21 14:17:46 -05:00
denise 7a9f01458c CC-1960: Internationalize Airtime / Support translations
-fixed langauge label on preferences page
2012-11-21 12:46:52 -05:00
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations
-added language option in preferences
2012-11-21 12:44:50 -05:00
Martin Konecny 8aa11f7e8c Better error message for api client constructor 2012-11-21 12:26:37 -05:00
denise c344282e4d CC-1960: Internationalize Airtime / Support translations
-rescan watched folder button was missing
2012-11-21 11:57:41 -05:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
denise f88a7bdb31 Merge branch '2.2.x' into devel 2012-11-21 10:54:17 -05:00
denise df6d199b60 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-21 10:52:52 -05:00
denise 48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
-fixed
2012-11-21 10:19:21 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations
- channged all js strings with embedded variables to use sprintf
2012-11-20 17:42:26 -05:00
James f246a09b1a CC-4662: Media Monitor: Unable to add watched folder because it's read only, by airtime-import command
- fixed
2012-11-20 17:35:18 -05:00
James 0870b1f018 CC-4697: airtime-import script fails silently on FLAC files
- fixed
2012-11-20 17:21:13 -05:00
denise 9762511693 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LocaleController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/application/views/scripts/playlist/playlist.phtml
	airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
2012-11-20 16:56:18 -05:00
Martin Konecny 9abd7fa431 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 16:48:17 -05:00
denise 06c3dcb69e CC-1960: Internationalize Airtime / Support translations
-added jquery.i18n library
2012-11-20 16:43:42 -05:00
denise e9b9f63630 CC-1960: Internationalize Airtime / Support translations
-added english translation file for datatables
2012-11-20 16:42:06 -05:00
Rudi Grinberg ac6a5a11bf docstring fixes 2012-11-20 16:41:45 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
2012-11-20 16:40:02 -05:00
James 8d9fa1976e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-20 16:39:04 -05:00
James 3c1f80de68 CC-4658: Smart Block: Unable to drag songs into block directly
- fixed
2012-11-20 16:38:43 -05:00
Martin Konecny fe44d23b74 CC-4715: Better management of tracks that are shorter than they claim to be. 2012-11-20 16:31:27 -05:00
Rudi Grinberg 3a682aeada cc-4585: fixed + added logging 2012-11-20 15:25:41 -05:00
Rudi Grinberg 7124cbe04d fixed bug where hidden files would be shown in library 2012-11-20 15:18:41 -05:00
Rudi Grinberg 20855c73b5 refactoring + fix typo 2012-11-20 15:10:38 -05:00
James d69faef560 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 15:05:20 -05:00
James 4737232b21 CC-2401: Shuffle option in playlists
- add delayed removing of success message
2012-11-20 15:05:09 -05:00
Rudi Grinberg 383244f962 changed implementation of timer thread because using threading.Timer does not allow us to properly inject
the AirtimeInstance object.
2012-11-20 14:44:58 -05:00
Rudi Grinberg 95e757a52c removed file mediator because it seems to be useless and incompatible with saas 2012-11-20 14:44:24 -05:00
Rudi Grinberg 58d888a59f Small refactoring to let user be assignable from any class that inherits from HasUser 2012-11-20 14:43:48 -05:00
Rudi Grinberg 58662b42be fixed typo missing self 2012-11-20 12:11:31 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
denise b801235c99 CC-1960: Internationalize Airtime / Support translations
-added gettext function to strings in layout/scripts
2012-11-20 11:33:37 -05:00
denise 43a797058c -extra quote typo 2012-11-20 11:33:37 -05:00
denise a76b9b305f CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
denise 2ce530c5bd CC-1960: Internationalize Airtime / Support translations
- fix to some controller strings
2012-11-20 11:33:37 -05:00
denise 9958d8da9f CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all strings in layout, and common
2012-11-20 11:33:37 -05:00
denise 8338152876 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all navigation strings
2012-11-20 11:33:37 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
denise e5f67c8b05 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-20 11:33:37 -05:00
Rudi Grinberg a69ff167d4 mass string change to _ 2012-11-20 11:33:37 -05:00
Rudi Grinberg 15741bdfa9 renamed links 2012-11-20 11:29:56 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
denise e0b19cc2d1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 11:17:03 -05:00
denise 8c49540d3d CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:16:10 -05:00