Translate security/roles component #23984

tibmt · 2018-10-12T10:49:03Z

Translation of Security Roles visualization components

elasticmachine · 2018-10-12T11:04:12Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-10-12T11:20:34Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

tibmt · 2018-10-12T12:40:47Z

retest

elasticmachine · 2018-10-12T12:55:19Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

pavel06081991 · 2018-10-18T09:02:16Z

x-pack/plugins/security/public/views/management/edit_role/components/collapsible_panel.tsx

-          <EuiLink onClick={this.toggleCollapsed}>{this.state.collapsed ? 'show' : 'hide'}</EuiLink>
+          <EuiLink onClick={this.toggleCollapsed}>
+            {this.state.collapsed
+              ? intl.formatMessage({


You can use FormattedMessage here. So you do not need to use injectI18n

pavel06081991 · 2018-10-18T09:02:54Z

x-pack/plugins/security/public/views/management/edit_role/components/collapsible_panel.tsx

+            {this.state.collapsed
+              ? intl.formatMessage({
+                  id:
+                    'xpack.security.views.management.editRoles.components.collapsiblePanel.showTitle',


showTitle => showLinkText

pavel06081991 · 2018-10-18T09:03:06Z

x-pack/plugins/security/public/views/management/edit_role/components/collapsible_panel.tsx

+                })
+              : intl.formatMessage({
+                  id:
+                    'xpack.security.views.management.editRoles.components.collapsiblePanel.hideTitle',


hideTitle => hideLinkText

pavel06081991 · 2018-10-18T09:04:12Z

x-pack/plugins/security/public/views/management/edit_role/components/delete_role_button.tsx

    if (!this.state.showModal) {
      return null;
    }
    return (
      <EuiOverlayMask>
        <EuiConfirmModal
-          title={'Delete Role'}
+          title={intl.formatMessage({


Check if title property supports JSX. I mean try to use FormattedMessage. If it works, then do not use injectI18n

pavel06081991 · 2018-10-18T09:04:33Z

x-pack/plugins/security/public/views/management/edit_role/components/delete_role_button.tsx

@@ -35,29 +36,55 @@ export class DeleteRoleButton extends Component<Props, State> {
    return (
      <Fragment>
        <EuiButtonEmpty color={'danger'} onClick={this.showModal}>
-          Delete role
+          <FormattedMessage
+            id="xpack.security.views.management.editRoles.components.deleteRoleButton.deleteRoleButton"


=> deleteRoleButtonLabel

pavel06081991 · 2018-10-18T11:49:38Z

x-pack/plugins/security/public/views/management/roles.js

+            i18n('xpack.security.views.management.roles.deleteRoleTitle', {
+              values: {
+                valueText: $scope.selectedRoles.length > 1 ?
+                  i18n('xpack.security.views.management.roles.deleteRoleRolesTitle', { defaultMessage: 'roles' })


deleteRoleRolesTitle => rolesSuccessfullyDeletedNotificationMessage

pavel06081991 · 2018-10-18T11:50:39Z

x-pack/plugins/security/public/views/management/roles.js

+          .then(() => toastNotifications.addSuccess(
+            i18n('xpack.security.views.management.roles.deleteRoleTitle', {
+              values: {
+                valueText: $scope.selectedRoles.length > 1 ?


use plural from ICU format for such cases. Come to me and I'll show you how to do it

pavel06081991 · 2018-10-18T11:51:13Z

x-pack/plugins/security/public/views/management/roles.js

@@ -45,12 +55,14 @@ routes.when(ROLES_PATH, {
          });
      };
      const confirmModalOptions = {
-        confirmButtonText: 'Delete role(s)',
+        confirmButtonText: i18n('xpack.security.views.management.roles.deleteRoleButton', { defaultMessage: 'Delete role(s)' }),


deleteRoleButton => deleteRoleConfirmButtonLabel

pavel06081991 · 2018-10-18T11:51:45Z

x-pack/plugins/security/public/views/management/roles.js

-      confirmModalOptions
+      confirmModal(
+        i18n('xpack.security.views.management.roles.sureToDeleteRoleTitle', {
+          defaultMessage: 'Are you sure you want to delete the selected role(s)? This action is irreversible!'


sureToDeleteRoleTitle => deletingRolesWarningMessage

pavel06081991 · 2018-10-18T11:52:40Z

x-pack/plugins/security/public/views/management/roles.js

@@ -85,5 +97,9 @@ routes.when(ROLES_PATH, {
    function getActionableRoles() {
      return $scope.roles.filter((role) => !role.metadata._reserved);
    }
+
+    $scope.noFoundMatches = i18n('xpack.security.views.management.roles.noMatches', {


noMatches => matchingText

elasticmachine · 2018-10-19T13:40:47Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

pavel06081991 · 2018-10-22T13:16:14Z

...rity/public/views/management/edit_role/components/privileges/es/elasticsearch_privileges.tsx

+                this.props.editable
+                  ? intl.formatMessage({
+                      id:
+                        'xpack.security.views.management.editRoles.components.privileges.es.elasticSearchPrivileges.addUserTitle',


addUserTitle => addUserPlaceholder

pavel06081991 · 2018-10-22T13:18:12Z

...public/views/management/edit_role/components/privileges/kibana/privilege_callout_warning.tsx

-              This role always grants read access to all spaces. To customize privileges for
-              individual spaces, you must create a new role.
+              <FormattedMessage
+                id="xpack.security.views.management.editRoles.components.privileges.kibana.privilegeCalloutWarning.alwaysGrantReadRoleTitle"


pavel06081991 · 2018-10-22T13:18:39Z

...public/views/management/edit_role/components/privileges/kibana/privilege_callout_warning.tsx

-            This role never grants access to any spaces within Kibana. To customize privileges for
-            individual spaces, you must create a new role.
+            <FormattedMessage
+              id="xpack.security.views.management.editRoles.components.privileges.kibana.privilegeCalloutWarning.roleNeverAccessTitle"


pavel06081991 · 2018-10-22T13:24:11Z

x-pack/plugins/security/public/views/management/roles.html

+                    class="kuiTableHeaderCell__liner"
+                    i18n-id="xpack.security.views.management.roles.roleTitle"
+                    i18n-default-message="Role {icon}"
+                    i18n-values="{


after #23684 is merged we will need to name properties which contain angular directives with unsafe_ prefix. So please check all places in this MR where you use i18n-values and if property contains directives - use prefix unsafe_.
for example icon => unsafe_icon

pavel06081991 · 2018-10-22T13:26:05Z

x-pack/plugins/security/public/views/management/roles.js

+          .then(() =>
+            toastNotifications.addSuccess(
+              i18n('xpack.security.views.management.roles.deleteRoleTitle', {
+                defaultMessage: 'Deleted {value, plural, one {# role} other {# roles}}',


remove #, just {role} other {roles}

elasticmachine · 2018-10-23T08:16:00Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

pavel06081991

LGTM

elasticmachine · 2018-10-23T15:30:38Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-10-23T17:06:59Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-10-24T13:05:09Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

joshdover · 2018-10-24T16:26:41Z

...ublic/views/management/edit_role/components/privileges/kibana/space_aware_privilege_form.tsx

-      helptext = 'View, edit, and share objects and apps within all spaces';
+      helptext = intl.formatMessage({
+        id:
+          'xpack.security.views.management.editRoles.components.privileges.kibana.spaceAwarePrivilegeForm.viewEditShareAppsWithinAllSpacesHelpText',


@azasypkin it'd be neat if the first part of these keys could be inferred by the component tree context so you could do something like:

intl.formatMessage({ id: `spaceAwarePrivilegeForm.viewEditShareAppsWithinAllSpacesHelpText` defaultMessage: '...' });

xpack.security.views.management.editRoles.components.privileges.kibana.spaceAwarePrivilegeForm.viewEditShareAppsWithinAllSpacesHelpText

Ugh, I believe it's a bad id: it's too detailed and contains a bunch of useless info (views?, editRoles implies both views and management, components is useless and doesn't say anything, privilges.kibana - seems to be useless since we have spaceAwarePrivilegeForm), we should have more laconic and useful ids. Why not just something like this?

Rule: {plugin}.{area}.[{sub-area}].{element}

Example: {xpack.security}.{editRoles}.{spaceAwarePrivilegeForm}.{viewEditShareAppsWithinAllSpacesHelpText}

I doubt that we'll have collision with this shorter form. @pavel06081991 @maryia-lapata thoughts?

yeah, agree. we will use it for all new ids

joshdover

LGTM after removing these lines

joshdover · 2018-10-24T16:27:20Z

x-pack/plugins/security/public/views/management/edit_role/lib/validate_role.ts

@@ -131,7 +176,15 @@ export class RoleValidator {
    if (privilege) {
      return valid();
    }
-    return invalid('Privilege is required');
+    // return invalid('Privilege is required');


joshdover · 2018-10-24T16:27:55Z

...ity/public/views/management/edit_role/components/privileges/kibana/privilege_space_table.tsx

@@ -137,7 +159,12 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
    ];
    if (!this.props.readonly) {
      columns.push({
-        name: 'Actions',
+        // name: 'Actions',


elasticmachine · 2018-10-25T12:07:25Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-06T14:31:16Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-08T10:49:40Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-08T13:57:17Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

pavel06081991 · 2018-11-08T13:57:54Z

retest

elasticmachine · 2018-11-08T15:57:51Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-08T18:23:40Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-09T10:40:22Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-09T15:36:56Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-13T11:02:11Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-11-19T12:36:15Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

pavel06081991 · 2018-11-19T12:36:45Z

retest

elasticmachine · 2018-11-19T14:20:27Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

pavel06081991 · 2018-11-19T17:07:45Z

retest

elasticmachine · 2018-11-19T19:19:14Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

Translate security/roles component

Translate security/roles component

2630186

tibmt self-assigned this Oct 12, 2018

tibmt requested a review from pavel06081991 October 12, 2018 10:49

Merge branch 'master' into feature/translations/security/roles

5eb9c92

pavel06081991 added the Project:i18n label Oct 16, 2018

pavel06081991 reviewed Oct 18, 2018

View reviewed changes

update Translation of Security Roles visualization components

bbac404

pavel06081991 reviewed Oct 22, 2018

View reviewed changes

Merge branch 'master' into feature/translations/security/roles

0cc02a5

update translation of security/roles component

d088841

pavel06081991 approved these changes Oct 23, 2018

View reviewed changes

pavel06081991 requested a review from joshdover October 23, 2018 14:54

update i18nrc.json

81c9c9f

maryia-lapata added the v6.6.0 label Oct 24, 2018

Merge branch 'master' into feature/translations/security/roles

321da7e

joshdover reviewed Oct 24, 2018

View reviewed changes

joshdover approved these changes Oct 24, 2018

View reviewed changes

update translation of security/roles components

0dd7da6

Update delete_role_button.tsx

ba4ed34

fix tests

d051135

pavel06081991 added 2 commits November 8, 2018 11:33

fix ts path for enzyme test helpers

626d0ef

Merge branch 'master' into feature/translations/security/roles

00e5b82

fix path to enzyme helpers test functions

1cc23d0

Merge branch 'master' into feature/translations/security/roles

092eddd

Merge branch 'master' into feature/translations/security/roles

e9ca6e0

Update unit tests

399bf4d

Merge branch 'master' into feature/translations/security/roles

2537432

pavel06081991 added 2 commits November 19, 2018 13:19

Merge branch 'master' into feature/translations/security/roles

bd0f87f

fix path to enzyme helpers

a86f3d4

pavel06081991 merged commit cf64825 into elastic:master Nov 20, 2018

pavel06081991 pushed a commit to pavel06081991/kibana that referenced this pull request Nov 20, 2018

Translate security/roles component (elastic#23984)

08e41b7

Translate security/roles component

pavel06081991 mentioned this pull request Nov 20, 2018

[6.x] Translate security/roles component (#23984) #25919

Merged

pavel06081991 added a commit that referenced this pull request Nov 20, 2018

Translate security/roles component (#23984) (#25919)

aa44d56

Translate security/roles component

maryia-lapata added the backported label Dec 17, 2018

Translate security/roles component #23984

Translate security/roles component #23984

Conversation

tibmt commented Oct 12, 2018

elasticmachine commented Oct 12, 2018

💔 Build Failed

elasticmachine commented Oct 12, 2018

💔 Build Failed

tibmt commented Oct 12, 2018

elasticmachine commented Oct 12, 2018

💔 Build Failed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticmachine commented Oct 19, 2018

💔 Build Failed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticmachine commented Oct 23, 2018

💔 Build Failed

pavel06081991 left a comment

Choose a reason for hiding this comment

elasticmachine commented Oct 23, 2018

💔 Build Failed

elasticmachine commented Oct 23, 2018

💔 Build Failed

elasticmachine commented Oct 24, 2018

💔 Build Failed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joshdover left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticmachine commented Oct 25, 2018

💔 Build Failed

elasticmachine commented Nov 6, 2018

💔 Build Failed

elasticmachine commented Nov 8, 2018

💔 Build Failed

elasticmachine commented Nov 8, 2018

💔 Build Failed

pavel06081991 commented Nov 8, 2018

elasticmachine commented Nov 8, 2018

💔 Build Failed

elasticmachine commented Nov 8, 2018

💔 Build Failed

elasticmachine commented Nov 9, 2018

💔 Build Failed

elasticmachine commented Nov 9, 2018

💔 Build Failed

elasticmachine commented Nov 13, 2018

💔 Build Failed

elasticmachine commented Nov 19, 2018

💔 Build Failed

pavel06081991 commented Nov 19, 2018

elasticmachine commented Nov 19, 2018

💔 Build Failed

pavel06081991 commented Nov 19, 2018

elasticmachine commented Nov 19, 2018

💚 Build Succeeded