Skip to content

[6.x] [i18n] Translate url (#26804) #27107

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

Merged
Nox911 merged 1 commit into from
Dec 13, 2018
Merged

[6.x] [i18n] Translate url (#26804) #27107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/ui/public/url/redirect_when_missing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { uiModules } from '../modules';
uiModules.get('kibana/url')
.service('redirectWhenMissing', function (Private) { return Private(RedirectWhenMissingProvider); });

export function RedirectWhenMissingProvider($location, kbnUrl, Promise) {
export function RedirectWhenMissingProvider($location, kbnUrl, Promise, i18n) {
/**
* Creates an error handler that will redirect to a url when a SavedObjectNotFound
* error is thrown
Expand Down Expand Up @@ -57,7 +57,9 @@ export function RedirectWhenMissingProvider($location, kbnUrl, Promise) {
url += (url.indexOf('?') >= 0 ? '&' : '?') + `notFound=${error.savedObjectType}`;

toastNotifications.addWarning({
title: 'Saved object is missing',
title: i18n('common.ui.url.savedObjectIsMissingNotificationMessage', {
defaultMessage: 'Saved object is missing'
}),
text: <MarkdownSimple>{error.message}</MarkdownSimple>,
});

Expand Down
8 changes: 6 additions & 2 deletions src/ui/public/url/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { AppStateProvider } from '../state_management/app_state';
uiModules.get('kibana/url')
.service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });

export function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
export function KbnUrlProvider($injector, $location, $rootScope, $parse, Private, i18n) {
/**
* the `kbnUrl` service was created to smooth over some of the
* inconsistent behavior that occurs when modifying the url via
Expand Down Expand Up @@ -114,7 +114,11 @@ export function KbnUrlProvider($injector, $location, $rootScope, $parse, Private

// if evaluation can't be made, throw
if (_.isUndefined(p)) {
throw new Error('Replacement failed, unresolved expression: ' + expr);
throw new Error(
i18n('common.ui.url.replacementFailedErrorMessage', {
defaultMessage: 'Replacement failed, unresolved expression: {expr}',
values: { expr }
}));
}

// append uriescape filter if not included
Expand Down