mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 01:01:41 +09:00
Fix setting lang codes directly to xe object, not xe.lang
This commit is contained in:
parent
dbd46edcc2
commit
0be03f216f
8 changed files with 46 additions and 46 deletions
|
|
@ -102,7 +102,7 @@ CKEDITOR.plugins.add('rx_paste', {
|
||||||
* Display an error message.
|
* Display an error message.
|
||||||
*/
|
*/
|
||||||
const displayError = function(type, message) {
|
const displayError = function(type, message) {
|
||||||
alert(window.xe.msg_file_upload_error + ' (Type ' + type + ")\n" + message);
|
alert(Rhymix.lang('msg_file_upload_error') + ' (Type ' + type + ")\n" + message);
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@
|
||||||
$.each(item.files, function(index, file) {
|
$.each(item.files, function(index, file) {
|
||||||
if(data.settings.maxFileSize > 0 && data.settings.maxFileSize < file.size) {
|
if(data.settings.maxFileSize > 0 && data.settings.maxFileSize < file.size) {
|
||||||
dfd.reject();
|
dfd.reject();
|
||||||
alert(window.xe.msg_exceeds_limit_size);
|
alert(window.xe.lang.msg_exceeds_limit_size);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
dfd.resolve();
|
dfd.resolve();
|
||||||
|
|
@ -133,19 +133,19 @@
|
||||||
if (res.result.message) {
|
if (res.result.message) {
|
||||||
alert(res.result.message);
|
alert(res.result.message);
|
||||||
} else {
|
} else {
|
||||||
alert(window.xe.msg_file_upload_error + " (Type 1)");
|
alert(window.xe.lang.msg_file_upload_error + " (Type 1)");
|
||||||
}
|
}
|
||||||
return chunkStatus = false;
|
return chunkStatus = false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
alert(window.xe.msg_file_upload_error + " (Type 2)");
|
alert(window.xe.lang.msg_file_upload_error + " (Type 2)");
|
||||||
return chunkStatus = false;
|
return chunkStatus = false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
chunkfail: function(e, res) {
|
chunkfail: function(e, res) {
|
||||||
lastUploadTime = Date.now();
|
lastUploadTime = Date.now();
|
||||||
if (chunkStatus) {
|
if (chunkStatus) {
|
||||||
alert(window.xe.msg_file_upload_error + " (Type 3)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
|
alert(window.xe.lang.msg_file_upload_error + " (Type 3)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
|
||||||
return chunkStatus = false;
|
return chunkStatus = false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -162,14 +162,14 @@
|
||||||
var result = res.response().result;
|
var result = res.response().result;
|
||||||
var temp_code = '';
|
var temp_code = '';
|
||||||
if (!result) {
|
if (!result) {
|
||||||
alert(window.xe.msg_file_upload_error + " (Type 4)");
|
alert(window.xe.lang.msg_file_upload_error + " (Type 4)");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!jQuery.isPlainObject(result)) {
|
if (!jQuery.isPlainObject(result)) {
|
||||||
result = jQuery.parseJSON(result);
|
result = jQuery.parseJSON(result);
|
||||||
}
|
}
|
||||||
if (!result) {
|
if (!result) {
|
||||||
alert(window.xe.msg_file_upload_error + " (Type 5)" + "<br>\n" + res.response().result);
|
alert(window.xe.lang.msg_file_upload_error + " (Type 5)" + "<br>\n" + res.response().result);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -215,7 +215,7 @@
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
$container.data('editorStatus', null);
|
$container.data('editorStatus', null);
|
||||||
alert(window.xe.msg_file_upload_error + " (Type 6)" + "<br>\n" + res.response().result);
|
alert(window.xe.lang.msg_file_upload_error + " (Type 6)" + "<br>\n" + res.response().result);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -229,7 +229,7 @@
|
||||||
}
|
}
|
||||||
}, 1000);
|
}, 1000);
|
||||||
if (chunkStatus) {
|
if (chunkStatus) {
|
||||||
alert(window.xe.msg_file_upload_error + " (Type 7)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
|
alert(window.xe.lang.msg_file_upload_error + " (Type 7)" + "<br>\n" + res.errorThrown + "<br>\n" + res.textStatus);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@
|
||||||
{@ Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
|
{@ Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
|
||||||
<script>
|
<script>
|
||||||
var admin_menu_srl = "{$admin_menu_srl}";
|
var admin_menu_srl = "{$admin_menu_srl}";
|
||||||
xe.cmd_find = "{$lang->cmd_find}";
|
xe.lang.cmd_find = "{$lang->cmd_find}";
|
||||||
xe.cmd_cancel = "{$lang->cmd_cancel}";
|
xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
|
||||||
xe.cmd_confirm = "{$lang->cmd_confirm}";
|
xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
|
||||||
xe.msg_select_menu = "{$lang->msg_select_menu}";
|
xe.lang.msg_select_menu = "{$lang->msg_select_menu}";
|
||||||
xe.lang.confirm_run = "{$lang->confirm_run}";
|
xe.lang.confirm_run = "{$lang->confirm_run}";
|
||||||
xe.lang.confirm_reset_admin_menu = "{$lang->confirm_reset_admin_menu}";
|
xe.lang.confirm_reset_admin_menu = "{$lang->confirm_reset_admin_menu}";
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -977,7 +977,7 @@ jQuery(function($){
|
||||||
tmpCount++;
|
tmpCount++;
|
||||||
|
|
||||||
// add html
|
// add html
|
||||||
var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
|
var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
|
||||||
var $displayInput = $('<input type="text" readonly>');
|
var $displayInput = $('<input type="text" readonly>');
|
||||||
$this.after($btn).after(' ').after($displayInput).hide();
|
$this.after($btn).after(' ').after($displayInput).hide();
|
||||||
$btn.xeModuleSearch();
|
$btn.xeModuleSearch();
|
||||||
|
|
@ -1050,10 +1050,10 @@ jQuery(function($){
|
||||||
$.xeMsgBox = {
|
$.xeMsgBox = {
|
||||||
htOptions : {}
|
htOptions : {}
|
||||||
};
|
};
|
||||||
//xe.cmd_cancel = "{$lang->cmd_cancel}";
|
//xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
|
||||||
//xe.cmd_confirm = "{$lang->cmd_confirm}";
|
//xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
|
||||||
var $msgBox = $.xeMsgBox.$msgBox = $("<section />").addClass("x_modal _common x").hide().css('z-index', 9999);
|
var $msgBox = $.xeMsgBox.$msgBox = $("<section />").addClass("x_modal _common x").hide().css('z-index', 9999);
|
||||||
$msgBox.html('<button type="button" class="x_close _cancel">×</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.cmd_confirm+'</button> </div> ');
|
$msgBox.html('<button type="button" class="x_close _cancel">×</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.lang.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.lang.cmd_confirm+'</button> </div> ');
|
||||||
$("body").append($msgBox);
|
$("body").append($msgBox);
|
||||||
$msgBox.find("._ok").click(function(){
|
$msgBox.find("._ok").click(function(){
|
||||||
$.xeMsgBox.fnOnOK();
|
$.xeMsgBox.fnOnOK();
|
||||||
|
|
@ -1513,13 +1513,13 @@ jQuery(function($){
|
||||||
|
|
||||||
// change text
|
// change text
|
||||||
if(options.create_type != 'save_and_use'){
|
if(options.create_type != 'save_and_use'){
|
||||||
$g11n_create.find('.save-useit').text(xe.cmd_save);
|
$g11n_create.find('.save-useit').text(xe.lang.cmd_save);
|
||||||
}
|
}
|
||||||
|
|
||||||
// #lang_create confirm
|
// #lang_create confirm
|
||||||
function g11n_create_save_confirm(){
|
function g11n_create_save_confirm(){
|
||||||
if($g11n_create.is(':visible') && is_create_changed){
|
if($g11n_create.is(':visible') && is_create_changed){
|
||||||
if(confirm(xe.msg_confirm_save_and_use_multilingual)){
|
if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
|
||||||
$g11n_create.find('.save-useit').trigger('click');
|
$g11n_create.find('.save-useit').trigger('click');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1531,7 +1531,7 @@ jQuery(function($){
|
||||||
function g11n_search_save_confirm(){
|
function g11n_search_save_confirm(){
|
||||||
if($g11n_search.is(':visible') && $g11n_search.find('.editMode').length){
|
if($g11n_search.is(':visible') && $g11n_search.find('.editMode').length){
|
||||||
var $search_item = $g11n_search.find('.editMode');
|
var $search_item = $g11n_search.find('.editMode');
|
||||||
if(confirm(xe.msg_confirm_save_and_use_multilingual)){
|
if(confirm(xe.lang.msg_confirm_save_and_use_multilingual)){
|
||||||
$search_item.find('.save').trigger('click');
|
$search_item.find('.save').trigger('click');
|
||||||
}else{
|
}else{
|
||||||
$search_item.find('.cancel').trigger('click');
|
$search_item.find('.cancel').trigger('click');
|
||||||
|
|
@ -1701,7 +1701,7 @@ jQuery(function($){
|
||||||
if(!options.view_modify) $g11n_search.find('.modify').hide();
|
if(!options.view_modify) $g11n_search.find('.modify').hide();
|
||||||
if(!options.view_delete) $g11n_search.find('.delete').hide();
|
if(!options.view_delete) $g11n_search.find('.delete').hide();
|
||||||
if(options.modify_type == 'save'){
|
if(options.modify_type == 'save'){
|
||||||
$g11n_search.find('.save').text(xe.cmd_save);
|
$g11n_search.find('.save').text(xe.lang.cmd_save);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Modify click
|
// Modify click
|
||||||
|
|
@ -1727,7 +1727,7 @@ jQuery(function($){
|
||||||
|
|
||||||
// Delete click
|
// Delete click
|
||||||
$g11n_search.find('.delete').click(function(){
|
$g11n_search.find('.delete').click(function(){
|
||||||
if(!confirm(xe.confirm_delete)) return;
|
if(!confirm(xe.lang.confirm_delete)) return;
|
||||||
|
|
||||||
var $this = $(this);
|
var $this = $(this);
|
||||||
|
|
||||||
|
|
@ -1827,7 +1827,7 @@ jQuery(function($){
|
||||||
});
|
});
|
||||||
|
|
||||||
if(!current_lang_value){
|
if(!current_lang_value){
|
||||||
alert(xe.msg_empty_multilingual);
|
alert(xe.lang.msg_empty_multilingual);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1933,8 +1933,8 @@ jQuery(function($){
|
||||||
}
|
}
|
||||||
$displayInput.attr('placeholder', $this.attr('placeholder'));
|
$displayInput.attr('placeholder', $this.attr('placeholder'));
|
||||||
|
|
||||||
var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
|
var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.lang.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.lang.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
|
||||||
var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.cmd_set_multilingual_text + '</a>').data('lang-target', id);
|
var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.lang.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.lang.cmd_set_multilingual_text + '</a>').data('lang-target', id);
|
||||||
|
|
||||||
$this.parent().addClass('g11n').addClass('x_input-append');
|
$this.parent().addClass('g11n').addClass('x_input-append');
|
||||||
$this.after($displayInput, $remover, $setter);
|
$this.after($displayInput, $remover, $setter);
|
||||||
|
|
@ -2377,7 +2377,7 @@ jQuery(function($){
|
||||||
$.xeMenuSelectorVar.$container = $.xeMsgBox.$msgBox;
|
$.xeMenuSelectorVar.$container = $.xeMsgBox.$msgBox;
|
||||||
|
|
||||||
$.xeMsgBox.confirmDialog({
|
$.xeMsgBox.confirmDialog({
|
||||||
sTitle : xe.msg_select_menu,
|
sTitle : xe.lang.msg_select_menu,
|
||||||
|
|
||||||
sText : '<select class="site_selector" style="width:100%;display:none"></select><div class="tree"></div>',
|
sText : '<select class="site_selector" style="width:100%;display:none"></select><div class="tree"></div>',
|
||||||
|
|
||||||
|
|
@ -2447,7 +2447,7 @@ jQuery(function($){
|
||||||
var sDisallowedType = $this.attr('data-disallowedType');
|
var sDisallowedType = $this.attr('data-disallowedType');
|
||||||
|
|
||||||
// add html
|
// add html
|
||||||
var $btn = $('<a class="x_btn moduleTrigger">' + xe.cmd_find + '</a>');
|
var $btn = $('<a class="x_btn moduleTrigger">' + xe.lang.cmd_find + '</a>');
|
||||||
$btn.data('multiple', sMultiple);
|
$btn.data('multiple', sMultiple);
|
||||||
$btn.data('allowedType', sAllowedType);
|
$btn.data('allowedType', sAllowedType);
|
||||||
$btn.data('disallowedType', sDisallowedType);
|
$btn.data('disallowedType', sDisallowedType);
|
||||||
|
|
|
||||||
|
|
@ -58,10 +58,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
window.xe.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
|
xe.lang.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
|
||||||
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
|
xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
|
||||||
window.xe.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
|
xe.lang.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
|
||||||
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
|
xe.lang.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
|
||||||
window.xe.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
|
xe.lang.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
|
||||||
window.xe.msg_file_upload_error = '{$lang->msg_file_upload_error}';
|
xe.lang.msg_file_upload_error = '{$lang->msg_file_upload_error}';
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -1522,12 +1522,12 @@ jQuery(function($){
|
||||||
|
|
||||||
$(document.body).on("click", '._menuSelector_menuTreeContainer a', function(){
|
$(document.body).on("click", '._menuSelector_menuTreeContainer a', function(){
|
||||||
if($(this).hasClass('_nodeType_1')){
|
if($(this).hasClass('_nodeType_1')){
|
||||||
$.xeMsgBox.alert(xe.msg_no_root);
|
$.xeMsgBox.alert(xe.lang.msg_no_root);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($(this).hasClass('_nodeType_3')){
|
if($(this).hasClass('_nodeType_3')){
|
||||||
$.xeMsgBox.alert(xe.msg_no_shortcut);
|
$.xeMsgBox.alert(xe.lang.msg_no_shortcut);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,11 +41,11 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
xe.confirm_delete = '{$lang->confirm_delete}';
|
xe.lang.confirm_delete = '{$lang->confirm_delete}';
|
||||||
xe.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
|
xe.lang.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
|
||||||
xe.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
|
xe.lang.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
|
||||||
xe.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
|
xe.lang.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
|
||||||
xe.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
|
xe.lang.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
|
||||||
xe.use_after_save = '{$lang->use_after_save}';
|
xe.lang.use_after_save = '{$lang->use_after_save}';
|
||||||
xe.cmd_save = '{$lang->cmd_save}';
|
xe.lang.cmd_save = '{$lang->cmd_save}';
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,10 @@
|
||||||
<load target="../../admin/tpl/js/jquery.tmpl.js" />
|
<load target="../../admin/tpl/js/jquery.tmpl.js" />
|
||||||
<load target="../../admin/tpl/js/jquery.jstree.js" />
|
<load target="../../admin/tpl/js/jquery.jstree.js" />
|
||||||
<script>
|
<script>
|
||||||
xe.cmd_find = "{$lang->cmd_find}";
|
xe.lang.cmd_find = "{$lang->cmd_find}";
|
||||||
xe.cmd_cancel = "{$lang->cmd_cancel}";
|
xe.lang.cmd_cancel = "{$lang->cmd_cancel}";
|
||||||
xe.cmd_confirm = "{$lang->cmd_confirm}";
|
xe.lang.cmd_confirm = "{$lang->cmd_confirm}";
|
||||||
xe.msg_select_menu = "{$lang->msg_select_menu}";
|
xe.lang.msg_select_menu = "{$lang->msg_select_menu}";
|
||||||
xe.lang.cmd_delete = '{$lang->cmd_delete}';
|
xe.lang.cmd_delete = '{$lang->cmd_delete}';
|
||||||
|
|
||||||
jQuery(document).ready(function(){
|
jQuery(document).ready(function(){
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue