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

Merge pull request #12892 from ibennetch/12536

Browse Source 
Rename Relations to Relationships in many places; Fixes issue #12536
This commit is contained in:
Michal Čihař 2017-01-18 09:51:20 +01:00 committed by GitHub
commit 1f8621dbb0
13 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -42,6 +42,7 @@ phpMyAdmin - ChangeLog
- issue #12854 Drop database is broken
- issue #12863 Can't toggle Event Scheduler on
- issue #12742 Finish removing dead code references to xls/xlsx import and export, which was removed some time ago.
- issue #12536 Rename "Relations" to "Relationships" in many places as it's the more proper term
4.6.6 (not yet released)
- issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

2
libraries/DisplayResults.php
View File

@ -1742,7 +1742,7 @@ class DisplayResults
$options_html .= '<div class="formelement">';
$choices = array(
'K' => __('Relational key'),
'D' => __('Display column for relations')
'D' => __('Display column for relationships')
);
$options_html .= Util::getRadioFields(

6
libraries/config/messages.inc.php
View File

@ -164,7 +164,7 @@ $strConfigExport_latex_data_continued_caption_name = __('Continued table caption
$strConfigExport_latex_data_label_name = __('Label key');
$strConfigExport_latex_mime_name = __('MIME type');
$strConfigExport_latex_null_name = __('Replace NULL with');
$strConfigExport_latex_relation_name = __('Relations');
$strConfigExport_latex_relation_name = __('Relationships');
$strConfigExport_latex_structure_caption_name = __('Table caption');
$strConfigExport_latex_structure_continued_caption_name
= __('Continued table caption');
@ -177,7 +177,7 @@ $strConfigExport_odt_columns_name = __('Put columns names in the first row');
$strConfigExport_odt_comments_name = __('Comments');
$strConfigExport_odt_mime_name = __('MIME type');
$strConfigExport_odt_null_name = __('Replace NULL with');
$strConfigExport_odt_relation_name = __('Relations');
$strConfigExport_odt_relation_name = __('Relationships');
$strConfigExport_odt_structure_or_data_name = __('Dump table');
$strConfigExport_onserver_name = __('Save on server');
$strConfigExport_onserver_overwrite_name = __('Overwrite existing file(s)');
@ -218,7 +218,7 @@ $strConfigExport_sql_max_query_size_name = __('Maximal length of created query')
$strConfigExport_sql_mime_name = __('MIME type');
$strConfigExport_sql_procedure_function_name
= sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
$strConfigExport_sql_relation_name = __('Relations');
$strConfigExport_sql_relation_name = __('Relationships');
$strConfigExport_sql_structure_or_data_name = __('Dump table');
$strConfigExport_sql_type_name = __('Export type');
$strConfigExport_sql_use_transaction_name = __('Enclose export in a transaction');

2
libraries/controllers/table/TableRelationController.php
View File

@ -279,7 +279,7 @@ class TableRelationController extends TableController
) {
$this->response->addHTML(
Util::getMessage(
__('Internal relations were successfully updated.'),
__('Internal relationships were successfully updated.'),
'', 'success'
)
);

2
libraries/plugins/export/ExportSql.php
View File

@ -1875,7 +1875,7 @@ class ExportSql extends ExportPlugin
$schema_create .= $this->_possibleCRLF()
. $this->_exportComment()
. $this->_exportComment(
__('RELATIONS FOR TABLE') . ' '
__('RELATIONSHIPS FOR TABLE') . ' '
. Util::backquote($table_alias, $sql_backquotes)
. ':'
);

18
libraries/pmd_common.php
View File

@ -548,7 +548,7 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
if ($foreigner
&& isset($foreigner['constraint'])
) {
return array(false, __('Error: relation already exists.'));
return array(false, __('Error: relationship already exists.'));
}
// note: in InnoDB, the index does not requires to be on a PRIMARY
// or UNIQUE key
@ -594,13 +594,13 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
}
$upd_query .= ';';
if ($GLOBALS['dbi']->tryQuery($upd_query)) {
return array(true, __('FOREIGN KEY relation has been added.'));
return array(true, __('FOREIGN KEY relationship has been added.'));
}
$error = $GLOBALS['dbi']->getError();
return array(
false,
__('Error: FOREIGN KEY relation could not be added!')
__('Error: FOREIGN KEY relationship could not be added!')
. "<br/>" . $error
);
}
@ -632,13 +632,13 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
if (PMA_queryAsControlUser($q, false, PMA\libraries\DatabaseInterface::QUERY_STORE)
) {
return array(true, __('Internal relation has been added.'));
return array(true, __('Internal relationship has been added.'));
}
$error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
return array(
false,
__('Error: Internal relation could not be added!')
__('Error: Internal relationship could not be added!')
. "<br/>" . $error
);
}
@ -676,13 +676,13 @@ function PMA_removeRelation($T1, $F1, $T2, $F2)
. '.' . PMA\libraries\Util::backquote($T2) . ' DROP FOREIGN KEY '
. PMA\libraries\Util::backquote($foreigner['constraint']) . ';';
if ($GLOBALS['dbi']->query($upd_query)) {
return array(true, __('FOREIGN KEY relation has been removed.'));
return array(true, __('FOREIGN KEY relationship has been removed.'));
}
$error = $GLOBALS['dbi']->getError();
return array(
false,
__('Error: FOREIGN KEY relation could not be removed!')
__('Error: FOREIGN KEY relationship could not be removed!')
. "<br/>" . $error
);
}
@ -709,11 +709,11 @@ function PMA_removeRelation($T1, $F1, $T2, $F2)
$error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
return array(
false,
__('Error: Internal relation could not be removed!') . "<br/>" . $error
__('Error: Internal relationship could not be removed!') . "<br/>" . $error
);
}
return array(true, __('Internal relation has been removed.'));
return array(true, __('Internal relationship has been removed.'));
}
/**

2
templates/database/designer/delete_relation_panel.phtml
View File

@ -18,7 +18,7 @@
<tr>
<td colspan="3" class="center nowrap">
<strong>
<?= __('Delete relation'); ?>
<?= __('Delete relationship'); ?>
</strong>
</td>
</tr>

2
templates/database/designer/new_relation_panel.phtml
View File

@ -19,7 +19,7 @@
<tr>
<td colspan="2" class="center nowrap">
<strong>
<?= __('Create relation'); ?>
<?= __('Create relationship'); ?>
</strong>
</td>
</tr>

4
templates/database/designer/options_panel.phtml
View File

@ -31,7 +31,7 @@
</tr>
<tr>
<td width="58" class="nowrap">
<?= __('Relation operator'); ?>
<?= __('Relationship operator'); ?>
</td>
<td width="102">
<select name="rel_opt" id="rel_opt">
@ -197,7 +197,7 @@
</tr>
<tr>
<td width="58" class="nowrap">
<?= __('Relation operator'); ?>
<?= __('Relationship operator'); ?>
</td>
<td width="102">
<select name="h_rel_opt" id="h_rel_opt">

8
templates/database/designer/side_menu.phtml
View File

@ -81,10 +81,10 @@ function getImg($path)
</span>
</a>
<a href="#" class="M_butt" id="rel_button">
<img title="<?= __('Create relation'); ?>"
<img title="<?= __('Create relationship'); ?>"
src="<?= getImg('pmd/relation.png'); ?>" />
<span class="hide hidable">
<?= __('Create relation'); ?>
<?= __('Create relationship'); ?>
</span>
</a>
<a href="#" class="M_butt" id="display_field_button">
@ -142,10 +142,10 @@ function getImg($path)
</span>
</a>
<a href="#" id="relLineInvert" class="<?= $params_array['relation_lines']; ?>" >
<img title="<?= __('Toggle relation lines'); ?>"
<img title="<?= __('Toggle relationship lines'); ?>"
src="<?= getImg('pmd/toggle_lines.png'); ?>" />
<span class="hide hidable">
<?= __('Toggle relation lines'); ?>
<?= __('Toggle relationship lines'); ?>
</span>
</a>
<?php if (! $visualBuilder) : ?>

2
templates/database/designer/table_list.phtml
View File

@ -11,7 +11,7 @@
<a href="#" class="M_butt" target="_self" >
<img alt="v"
id="key_HS"
title="<?= __('Hide/Show Tables with no relation'); ?>"
title="<?= __('Hide/Show Tables with no relationship'); ?>"
src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
data-down="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow2.png'); ?>" />

4
templates/table/relation/common_form.phtml
View File

@ -73,13 +73,13 @@
<?php if ($cfgRelation['relwork']): ?>
<?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
<br/>
<?= PMA\libraries\Util::getDivForSliderEffect('ir_div', __('Internal relations')) ?>
<?= PMA\libraries\Util::getDivForSliderEffect('ir_div', __('Internal relationships')) ?>
<?php endif; ?>
<?php $save_row = array_values($columns);
$saved_row_cnt = count($save_row);?>
<fieldset>
<legend><?= __('Internal relations') , PMA\libraries\Util::showDocu('config', 'cfg_Servers_relation'); ?></legend>
<legend><?= __('Internal relationships') , PMA\libraries\Util::showDocu('config', 'cfg_Servers_relation'); ?></legend>
<table id="internal_relations" class="relationalTable">
<tr>
<th><?= __('Column'); ?></th>

2
test/classes/plugin/export/ExportSqlTest.php
View File

@ -1226,7 +1226,7 @@ class ExportSqlTest extends PMATestCase
);
$this->assertContains(
"-- RELATIONS FOR TABLE :\n" .
"-- RELATIONSHIPS FOR TABLE :\n" .
"-- foo\n" .
"-- ftable -> ffield",
$result