nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undefined messages in Designer

Browse Source
This commit is contained in:
Marc Delisle
2010-11-07 07:18:53 -05:00
parent 850556978b
commit ab58b2cf6f
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/messages.php
View File

@@ -88,15 +88,7 @@ $js_messages['strInlineEdit'] = __('Inline Edit');
/* For tbl_change.js */
$js_messages['strIgnore'] = __('Ignore');
/* Designer */
$js_messages['strModifications'] = __('Modifications have been saved');
$js_messages['strRelationDeleted'] = __('Relation deleted');
$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation added');
$js_messages['strInternalRelationAdded'] = __('Internal relation added');
$js_messages['strErrorRelationAdded'] = __('Error: Relation not added.');
$js_messages['strErrorRelationExists'] = __('Error: relation already exists.');
$js_messages['strErrorSaveTable'] = __('Error saving coordinates for Designer.');
$js_messages['strGeneralRelationFeat:strDisabled'] = __('General relation features') . ': ' . __('Disabled');
/* Designer (pmd/scripts/move.js) */
$js_messages['strSelectReferencedKey'] = __('Select referenced key');
$js_messages['strSelectForeignKey'] = __('Select Foreign Key');
$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key');

6
pmd/scripts/ajax.js
View File

@@ -103,17 +103,17 @@ function PrintXML()
//xmldoc.getElementsByTagName('root')[0].getAttribute("act")
if (root.getAttribute('act') == 'save_pos') {
layer_alert(PMA_messages[root.getAttribute('return')]);
layer_alert(root.getAttribute('return'));
}
if (root.getAttribute('act') == 'relation_upd') {
layer_alert(PMA_messages[root.getAttribute('return')]);
layer_alert(root.getAttribute('return'));
if (root.getAttribute('b') == '1') {
contr.splice(root.getAttribute('K'), 1);
Re_load();
}
}
if (root.getAttribute('act') == 'relation_new') {
layer_alert(PMA_messages[root.getAttribute('return')]);
layer_alert(root.getAttribute('return'));
if (root.getAttribute('b') == '1') {
var i = contr.length;
var t1 = root.getAttribute('DB1') + '.' + root.getAttribute('T1');

2
pmd_relation_new.php
View File

@@ -65,7 +65,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
// internal (pmadb) relation
} else {
if ($GLOBALS['cfgRelation']['relwork'] == false) {
PMD_return_new(0, 'strGeneralRelationFeat:strDisabled');
PMD_return_new(0, _('General relation features') . ':' . _('Disabled'));
} else {
// no need to recheck if the keys are primary or unique at this point,
// this was checked on the interface part

2
pmd_save_pos.php
View File

@@ -41,7 +41,7 @@ function PMD_err_sav() {
if (! empty($die_save_pos)) {
header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache");
die('<root act="save_pos" return="strErrorSaveTable"></root>');
die('<root act="save_pos" return="' . __('Error saving coordinates for Designer.') . '"></root>');
}
}