Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged from sub repository (updated ckeditor, filters - step 3)

Browse source 
Release commit
This commit is contained in:
RainLoop Team 2014-12-06 01:01:33 +04:00
parent ec7324b061
commit 42b8a446c6
464 changed files with 10395 additions and 1303 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dev/App/User.js
View file

@ -1265,25 +1265,25 @@
bTwitter = Settings.settingsGet('AllowTwitterSocial')
;
Utils.initOnStartOrLangChange(function () {
$.extend(true, $.magnificPopup.defaults, {
'tClose': Utils.i18n('MAGNIFIC_POPUP/CLOSE'),
'tLoading': Utils.i18n('MAGNIFIC_POPUP/LOADING'),
'gallery': {
'tPrev': Utils.i18n('MAGNIFIC_POPUP/GALLERY_PREV'),
'tNext': Utils.i18n('MAGNIFIC_POPUP/GALLERY_NEXT'),
'tCounter': Utils.i18n('MAGNIFIC_POPUP/GALLERY_COUNTER')
},
'image': {
'tError': Utils.i18n('MAGNIFIC_POPUP/IMAGE_ERROR')
},
'ajax': {
'tError': Utils.i18n('MAGNIFIC_POPUP/AJAX_ERROR')
}
});
}, this);
// Utils.initOnStartOrLangChange(function () {
//
// $.extend(true, $.magnificPopup.defaults, {
// 'tClose': Utils.i18n('PREVIEW_POPUP/CLOSE'),
// 'tLoading': Utils.i18n('PREVIEW_POPUP/LOADING'),
// 'gallery': {
// 'tPrev': Utils.i18n('PREVIEW_POPUP/GALLERY_PREV'),
// 'tNext': Utils.i18n('PREVIEW_POPUP/GALLERY_NEXT'),
// 'tCounter': Utils.i18n('PREVIEW_POPUP/GALLERY_COUNTER')
// },
// 'image': {
// 'tError': Utils.i18n('PREVIEW_POPUP/IMAGE_ERROR')
// },
// 'ajax': {
// 'tError': Utils.i18n('PREVIEW_POPUP/AJAX_ERROR')
// }
// });
//
// }, this);
if (SimplePace)
{