denise
82b4454363
merge from devel
2012-12-03 11:07:47 -05:00
denise
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
Daniel James
e54f8db7d6
Added copyright and contact headers to gettext files
2012-12-03 14:36:47 +00:00
Martin Konecny
b474035d76
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/common/DateHelper.php
airtime_mvc/public/js/airtime/library/library.js
2012-11-30 18:01:02 -05:00
martin
70511746d0
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-11-30 17:58:00 -05:00
denise
2f0c6b702a
CC-1960: Internationalize Airtime / Support translations
...
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
denise
81c9b4d862
CC-1960: Internationalize Airtime / Support translations
...
-added a template po file for translations
2012-11-29 11:47:11 -05:00
denise
dfc7bbbd5a
CC-1960: Internationalize Airtime / Support translations
...
-small change to en_CA po file
2012-11-29 11:32:25 -05:00
denise
0e3525180e
CC-1960: Internationalize Airtime / Support translations
...
-added default locale into cc_pref
2012-11-29 10:57:59 -05:00
denise
260c6aea59
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
2012-11-29 10:50:01 -05:00
denise
7a4e871495
Merge branch 'devel' into cc-1960-internationalize-airtime
2012-11-29 10:47:17 -05:00
denise
b50ed74fe9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-29 10:46:35 -05:00
James
4ad9e28e14
CC-1960: Internationalize Airtime / Support translations
...
- korean lang pack
2012-11-29 10:31:13 -05:00
denise
378140f174
CC-1960: Internationalize Airtime / Support translations
...
-removed .po file from root of repo
2012-11-28 17:20:50 -05:00
denise
b674cb9b01
CC-1960: Internationalize Airtime / Support translations
...
-revised .po file
2012-11-28 16:54:29 -05:00
denise
542434d9f0
CC-1960: Internationalize Airtime / Support translations
...
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
denise
9689c75bed
CC-1960: Internationalize Airtime / Support translations
...
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
2012-11-28 11:54:22 -05:00
Daniel James
ef37eb1d4c
Added flac package to dependencies for snapshot package
2012-11-28 11:45:58 +00:00
denise
e475c2e99e
CC-1960: Internationalize Airtime / Support translations
...
-overwrote zend from stringLength validator
2012-11-27 17:28:27 -05:00
denise
ac0e1d07be
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
2012-11-27 17:11:43 -05:00
denise
9acfb6c181
CC-1960: Internationalize Airtime / Support translations
...
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
James
1196c1c07c
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
2012-11-27 15:56:04 -05:00
James
8acc8fce76
CC-1960: Internationalize Airtime / Support translations
...
- fixed close button on show add form
2012-11-27 15:55:32 -05:00
denise
37ce75f686
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
2012-11-27 15:52:14 -05:00
denise
22bfc45497
CC-1960: Internationalize Airtime / Support translations
...
-defined translations for show builder datatable
2012-11-27 15:51:50 -05:00
James
1ce448b50b
Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
2012-11-27 13:35:09 -05:00
James
7cc4c88f2f
CC-1960: Internationalize Airtime / Support translations
...
- css change for close icon
2012-11-27 13:34:54 -05:00
denise
42d535a922
CC-1960: Internationalize Airtime / Support translations
...
-unlocalized some strings
2012-11-27 12:33:43 -05:00
denise
c4062f7770
CC-1960: Internationalize Airtime / Support translations
...
-fixed javascript strings
2012-11-27 12:31:21 -05:00
denise
0a642fc717
CC-1960: Internationalize Airtime / Support translations
2012-11-27 12:23:16 -05:00
denise
d2ed927e65
CC-1960: Internationalize Airtime / Support translations
...
-playout history datatable was missing translation table
2012-11-27 12:17:59 -05:00
Martin Konecny
7249e36081
-2.2.1 upgrade scripts
2012-11-27 12:13:16 -05:00
denise
36c6edcff1
CC-1960: Internationalize Airtime / Support translations
...
-addded gettext wrapper to string missing it
2012-11-27 12:10:32 -05:00
denise
f86cd7d474
CC-1960: Internationalize Airtime / Support translations
...
-fixed typos
2012-11-27 12:03:38 -05:00
denise
b9b387fcd0
CC-1960: Internationalize Airtime / Support translations
...
-fixed typos
2012-11-27 11:59:55 -05:00
denise
3b124e6f5d
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-saving block length was including files that do not exist
2012-11-26 15:05:27 -05:00
denise
ae15a47bc5
CC-1960: Internationalize Airtime / Support translations
...
-added .po file
2012-11-26 14:22:15 -05:00
denise
af70f241d2
CC-1960: Internationalize Airtime / Support translations
...
-updated. po file
2012-11-26 14:19:13 -05:00
denise
ddb6289c87
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 16:54:39 -05:00
denise
04f6ae5c1a
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-11-23 16:53:51 -05:00
denise
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
martin
735640d40b
Merge branch 'lsof_quote_fix' of https://github.com/rgrinberg/Airtime into devel
2012-11-23 16:18:23 -05:00
martin
50bdeeef26
CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
2012-11-23 16:00:10 -05:00
martin
5ba964c783
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 14:03:51 -05:00
martin
75adf9b6a1
CC-4701: same webstream played twice in a row does not work.
...
-fixed
2012-11-23 14:03:31 -05:00
denise
c6a5db4a78
CC-1960: Internationalize Airtime / Support translations
...
-dashboard was missing a translation - fixed
2012-11-23 10:48:44 -05:00
denise
4804685dfd
CC-1960: Internationalize Airtime / Support translations
...
-navigation bar was not showing localized text -fixed
2012-11-22 18:15:54 -05:00
denise
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
Martin Konecny
9399b357ba
bump generated snapshot version to 2.3
2012-11-22 17:09:08 -05:00
James
8d3024d42e
api_client fix
2012-11-22 15:59:37 -05:00