The branch, master has been updated via ab58b2cf6f0a2d721df1d2a0bb0e4ee44e4053b1 (commit) from 850556978b89629dde667a482937755dde21fc0c (commit) - Log ----------------------------------------------------------------- commit ab58b2cf6f0a2d721df1d2a0bb0e4ee44e4053b1 Author: Marc Delisle <marc@infomarc.info> Date: Sun Nov 7 07:18:53 2010 -0500 undefined messages in Designer ----------------------------------------------------------------------- Summary of changes: js/messages.php | 10 +--------- pmd/scripts/ajax.js | 6 +++--- pmd_relation_new.php | 2 +- pmd_save_pos.php | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/js/messages.php b/js/messages.php index 16e1a83..c034d74 100644 --- a/js/messages.php +++ b/js/messages.php @@ -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'); diff --git a/pmd/scripts/ajax.js b/pmd/scripts/ajax.js index a26246d..7f48147 100644 --- a/pmd/scripts/ajax.js +++ b/pmd/scripts/ajax.js @@ -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'); diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 32d42ef..6ea4485 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -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 diff --git a/pmd_save_pos.php b/pmd_save_pos.php index cea1001..fb9d1eb 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -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>'); } } hooks/post-receive -- phpMyAdmin