Skip to content

Commit

Permalink
Merge pull request #9877 from RocketChat/fix-not-translated-phrases
Browse files Browse the repository at this point in the history
[Fix] Not Translated Phrases
  • Loading branch information
bernardoetrevisan committed Feb 26, 2018
2 parents 5033cab + bcc214d commit 273cdbc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@
"Branch": "Branch",
"Broadcast_Connected_Instances": "Broadcast Connected Instances",
"Bugsnag_api_key": "Bugsnag API Key",
"Build_Environment": "Build Environment",
"bulk-create-c": "Bulk Create Channels",
"bulk-create-c_description": "Permission to create channels in bulk",
"bulk-register-user": "Bulk Create Channels",
Expand Down Expand Up @@ -1646,6 +1647,7 @@
"run-migration": "Run Migration",
"run-migration_description": "Permission to run the migrations",
"Running_Instances": "Running Instances",
"Runtime_Environment": "Runtime Environment",
"S_new_messages_since_s": "%s new messages since %s",
"Same_As_Token_Sent_Via": "Same as \"Token Sent Via\"",
"Same_Style_For_Mentions": "Same style for mentions",
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-admin/client/adminInfo.html
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ <h3>{{_ "Broadcast_Connected_Instances"}}</h3>
{{/each}}
{{/if}}

<button type="button" class="button primary refresh">Refresh</button>
<button name="refresh" type="button" class="button primary refresh">{{_ "Refresh"}}</button>
{{else}}
{{_ "Loading..."}}
{{/if}}
Expand Down
14 changes: 7 additions & 7 deletions tests/end-to-end/ui/11-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('[Administration]', () => {
sideNav.preferencesClose.click();
});

describe('[Admin View]', () => {
describe.only('[Admin View]', () => {
before(() => {
sideNav.sidebarMenu.click();
sideNav.admin.waitForVisible(5000);
Expand Down Expand Up @@ -55,21 +55,21 @@ describe('[Administration]', () => {
admin.infoCommitTable.isVisible().should.be.true;
});

it('the first title should be Runtime_Environment', () => {
it('the first title should be Runtime Environment', () => {
admin.infoRuntimeTableTitle.moveToObject();
admin.infoRuntimeTableTitle.getText().should.equal('Runtime_Environment');
admin.infoRuntimeTableTitle.getText().should.equal('Runtime Environment');
});

it('it should show the Runtime_Environment table', () => {
it('it should show the Runtime Environment table', () => {
admin.infoRuntimeTable.isVisible().should.be.true;
});

it('the first title should be Build_Environment', () => {
it('the first title should be Build Environment', () => {
admin.infoBuildTableTitle.moveToObject();
admin.infoBuildTableTitle.getText().should.equal('Build_Environment');
admin.infoBuildTableTitle.getText().should.equal('Build Environment');
});

it('it should show the Build_Environment table', () => {
it('it should show the Build Environment table', () => {
admin.infoBuildTable.isVisible().should.be.true;
});
});
Expand Down

0 comments on commit 273cdbc

Please sign in to comment.