Translations for Reporting plugin #22757
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # .i18nrc.json
tsullivan
reviewed
Sep 11, 2018
| Generate {{ exportConfig.exportType.name }} | ||
| <span i18n-id="xpack.reporting.exportConfig.generateButtonLabel" | ||
| i18n-default-message="Generate {name}" | ||
| i18n-values="{ name: exportConfig.exportType.name }"></span> |
There was a problem hiding this comment.
Formatting and indentation looks messed up here. Should be like:
<span
i18n-id="xpack.reporting.exportConfig.generateButtonLabel"
i18n-default-message="Generate {name}"
i18n-values="{ name: exportConfig.exportType.name }"
>
</span>
tsullivan
reviewed
Sep 11, 2018
| <h2 class="kuiLocalDropdownTitle"> | ||
| Reporting | ||
| </h2> | ||
| <h2 class="kuiLocalDropdownTitle" i18n-id="xpack.reporting.exportConfig.reportingTitle" i18n-default-message="Reporting"></h2> |
There was a problem hiding this comment.
Let's break this line up per attribute, for consistency
tsullivan
reviewed
Sep 11, 2018
| Please save your work before generating a report. | ||
| <div ng-show="exportConfig.isDirty()" data-test-subj="unsavedChangesReportingWarning" | ||
| i18n-id="xpack.reporting.exportConfig.saveWorkDescription" | ||
| i18n-default-message="Please save your work before generating a report."> |
There was a problem hiding this comment.
<div
ng-show="exportConfig.isDirty()"
data-test-subj="unsavedChangesReportingWarning"
i18n-id="xpack.reporting.exportConfig.saveWorkDescription"
i18n-default-message="Please save your work before generating a report."
>
</div>
tsullivan
reviewed
Sep 11, 2018
| @@ -56,15 +56,16 @@ module.directive('exportConfig', ($rootScope, reportingDocumentControl, reportin | |||
| $scope.updateUrl = (options) => { | |||
| return $scope.getRelativePath(options) | |||
| .then(relativePath => { | |||
| $scope.exportConfig.absoluteUrl = createAbsoluteUrl(relativePath); | |||
| $scope.exportConfig.absoluteUrl = createAbsoluteUrl(relativePath) | |||
| || i18n('xpack.reporting.exportConfig.generationUrl.loadingPlaceholder', { defaultMessage: 'Loading...' }); | |||
There was a problem hiding this comment.
This moved code looks like it needs some manual testing. I'm not super familiar with this file. Do you have testing steps for this?
tsullivan
requested changes
Sep 11, 2018
|
Blocked by #22441 |
💔 Build Failed |
💔 Build Failed |
|
Hi, can you look into the merge conflict? |
💔 Build Failed |
💔 Build Failed |
|
Hi, looks like there's one small merge conflict on this. |
💔 Build Failed |
💔 Build Failed |
💔 Build Failed |
💔 Build Failed |
💔 Build Failed |
💚 Build Succeeded |
|
Here was a broken functional test This was caused by |
tsullivan
pushed a commit
to tsullivan/kibana
that referenced
this pull request
Dec 3, 2018
* Translate Reporting * Use i18n core * Translate Reporting * Translate Reporting * Refactoring * Add reporting to i18n config * Fix tooltip translation * Apply formatting for html * Translate label in TS files. * Reduce tag number * Rename ids * Update snapshot * Revert changes for removing span * Add types * Translate statuses * update translation of Reporting plugin * fix variable name * fix constants names * update reporting translation * fix copyright * Fix types/angular packages incompatibility * Update yarn.lock * Fix duplicated import * Fix CI * Small adjustments
|
6.x/6.6.0: #26569 |
tsullivan
added a commit
that referenced
this pull request
Dec 4, 2018
* Translate Reporting * Use i18n core * Translate Reporting * Translate Reporting * Refactoring * Add reporting to i18n config * Fix tooltip translation * Apply formatting for html * Translate label in TS files. * Reduce tag number * Rename ids * Update snapshot * Revert changes for removing span * Add types * Translate statuses * update translation of Reporting plugin * fix variable name * fix constants names * update reporting translation * fix copyright * Fix types/angular packages incompatibility * Update yarn.lock * Fix duplicated import * Fix CI * Small adjustments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apply translations for Reporting plugin
Fixes #22647