Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] Not Translated Phrases #9877

Merged
merged 8 commits into from
Feb 26, 2018
Merged

[Fix] Not Translated Phrases #9877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e6f672
[Fix] Not Translated Phrases
bernardoetrevisan Feb 23, 2018
0519d7c
Merge branch 'develop' into fix-not-translated-phrases
rodrigok Feb 24, 2018
9c2899f
Merge branch 'develop' into fix-not-translated-phrases
rodrigok Feb 26, 2018
04bf4a8
Merge remote-tracking branch 'origin/develop' into fix-not-translated…
bernardoetrevisan Feb 26, 2018
8201339
Merge remote-tracking branch 'origin/fix-not-translated-phrases' into…
bernardoetrevisan Feb 26, 2018
4a6c05e
Merge branch 'develop' into fix-not-translated-phrases
bernardoetrevisan Feb 26, 2018
d3d8053
Fix tests
bernardoetrevisan Feb 26, 2018
bcc214d
Merge remote-tracking branch 'origin/fix-not-translated-phrases' into…
bernardoetrevisan Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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