Rename Relations to Relationships in many places; Fixes issue #12536 #12892

Merged
merged 2 commits into from Jan 18, 2017

Projects

None yet

3 participants

@ibennetch
Contributor

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Before submitting pull request, please check that every commit:

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
  • Any new functionality is covered by tests
@ibennetch
Contributor

Looking for another set of eyes to make sure I didn't change anything I shouldn't have and also hoping I got them all.

A quick and dirty grep shows these instances remain (which I think look correct, but I'm looking for other opinions either in agreement or disagreement):

js/messages.php:$js_messages['strExportRelationalSchema'] = __('Export relational schema');
libraries/DisplayResults.php:                'K'   => __('Relational key'),
libraries/DisplayResults.php:                true, true, '', 'relational_display_' . $this->__get('unique_id')
libraries/pmd_common.php:        return array(false, __('Error: Relational features are disabled!'));
libraries/plugins/schema/eps/EpsRelationSchema.php:     * PMA\libraries\plugins\schema\eps\RelationStatsEps::__construct()
libraries/plugins/schema/pdf/PdfRelationSchema.php:            $this->diagram->Bookmark(__('Relational schema'));
libraries/plugins/schema/pdf/PdfRelationSchema.php:            0, 6, $i . ' ' . __('Relational schema'), 0, 1,
libraries/plugins/schema/dia/DiaRelationSchema.php:     * @see    TableStatsDia::__construct(),RelationStatsDia::__construct()
libraries/plugins/schema/svg/SvgRelationSchema.php:     *       PMA\libraries\plugins\schema\svg\RelationStatsSvg::__construct()
libraries/config/messages.inc.php:$strConfigForm_DisplayRelationalSchema = __('Display relational schema');
libraries/config/messages.inc.php:$strConfigPmaNoRelation_DisableWarning_desc = __(
libraries/config/messages.inc.php:$strConfigRelationalDisplay_name = __('Relational display');
libraries/config/messages.inc.php:$strConfigRelationalDisplay_desc = __('For display Options');
libraries/config/messages.inc.php:$strConfigServers_relation_desc = __(
libraries/config/messages.inc.php:$strConfigServers_relation_name = __('Relation table');
libraries/controllers/table/TableRelationController.php:    public function __construct($options_array, $cfgRelation, $tbl_storage_engine,
libraries/relation.lib.php:             . __('General relation features')
libraries/relation.lib.php:            __('General relation features'),
templates/database/designer/schema_export.phtml:        <label><?= __('Select Export Relational Type'); ?></label><br/>
templates/table/secondary_tabs.phtml:            'text' => __('Relation view'),
templates/table/relation/common_form.phtml:                    <th><?= __('Internal relation'); ?>
test/libraries/PMA_relation_test.php:        $result = __('General relation features');
@ibennetch
Contributor

Note that I did not update the po files so the translators will see this as a new string.

@ibennetch ibennetch Rename Relations to Relationships in many places; Fixes issue #12536
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
77c33d0
@codecov-io
codecov-io commented Jan 13, 2017 edited

Current coverage is 54.21% (diff: 26.66%)

Merging #12892 into master will not change coverage

@@             master     #12892   diff @@
==========================================
  Files           465        465          
  Lines         69647      69647          
  Methods        2128       2128          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits          37758      37758          
  Misses        31889      31889          
  Partials          0          0          

Powered by Codecov. Last update b40e9c1...77c33d0

@nijel nijel self-assigned this Jan 18, 2017
@nijel nijel added this to the 4.7.0 milestone Jan 18, 2017
@nijel nijel merged commit 1f8621d into phpmyadmin:master Jan 18, 2017
@nijel
Member
nijel commented Jan 18, 2017

Looks good, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment