-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
Remove angular-translate #13066
Merged
Merged
Remove angular-translate #13066
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
186 changes: 0 additions & 186 deletions
186
docs/development/plugin/development-internationalization.asciidoc
This file was deleted.
Oops, something went wrong.
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
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
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
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,7 @@ | ||
require('jquery'); | ||
require('../node_modules/angular/angular'); | ||
require('../node_modules/angular-translate'); | ||
module.exports = window.angular; | ||
|
||
require('../node_modules/angular-elastic/elastic'); | ||
|
||
require('ui/modules').get('kibana', ['monospaced.elastic', 'pascalprecht.translate']); | ||
require('ui/modules').get('kibana', ['monospaced.elastic']); |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,9 @@ | ||
require('angular'); | ||
require('ui/angular-bootstrap'); | ||
var uiModules = require('ui/modules').uiModules; | ||
var chrome = require('ui/chrome'); | ||
|
||
var kibana = uiModules.get('kibana', ['ui.bootstrap', 'pascalprecht.translate']); | ||
var kibana = uiModules.get('kibana', ['ui.bootstrap']); | ||
|
||
module.exports = kibana.config(function ($tooltipProvider) { | ||
$tooltipProvider.setTriggers({ 'mouseenter': 'mouseleave click' }); | ||
}) | ||
.config(function ($translateProvider) { | ||
$translateProvider.translations('default', chrome.getTranslations()); | ||
$translateProvider.preferredLanguage('default'); | ||
// Enable escaping of HTML | ||
// issue in https://angular-translate.github.io/docs/#/guide/19_security | ||
$translateProvider.useSanitizeValueStrategy('escape'); | ||
}); | ||
}); |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -306,13 +306,7 @@ [email protected]: | |
version "0.0.15" | ||
resolved "https://registry.yarnpkg.com/angular-sortable-view/-/angular-sortable-view-0.0.15.tgz#e8463df909db83d641b028f0773a10d50292874f" | ||
|
||
[email protected]: | ||
version "2.13.1" | ||
resolved "https://registry.yarnpkg.com/angular-translate/-/angular-translate-2.13.1.tgz#05673eb371986fc11edc151f590299d7e0c46228" | ||
dependencies: | ||
angular ">=1.2.26 <=1.6" | ||
|
||
[email protected], angular@>=1.0.6, "angular@>=1.2.26 <=1.6": | ||
[email protected], angular@>=1.0.6: | ||
version "1.6.5" | ||
resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.5.tgz#37f788eebec5ce2e3fa02b17bbcb2a231576a0d6" | ||
|
||
|
@@ -4157,12 +4151,6 @@ flat-cache@^1.2.1: | |
graceful-fs "^4.1.2" | ||
write "^0.2.1" | ||
|
||
flat@^1.2.0: | ||
version "1.6.1" | ||
resolved "https://registry.yarnpkg.com/flat/-/flat-1.6.1.tgz#476b9dbb70d5e9340dbbc038bde084a20945921c" | ||
dependencies: | ||
is-buffer "~1.1.2" | ||
|
||
flatten@^1.0.2: | ||
version "1.0.2" | ||
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" | ||
|
@@ -4698,14 +4686,6 @@ growly@^1.3.0: | |
version "1.3.0" | ||
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" | ||
|
||
[email protected]: | ||
version "0.3.0" | ||
resolved "https://registry.yarnpkg.com/grunt-angular-translate/-/grunt-angular-translate-0.3.0.tgz#bd0118afa24d8f570231fd8d52d829d808c511b3" | ||
dependencies: | ||
flat "^1.2.0" | ||
json-stable-stringify "^1.0.0" | ||
lodash "~2.4.1" | ||
|
||
[email protected]: | ||
version "0.14.5" | ||
resolved "https://registry.yarnpkg.com/grunt-aws-s3/-/grunt-aws-s3-0.14.5.tgz#f55019acfbeb05b89b245a51ccf1a81dbf868df4" | ||
|
@@ -5588,7 +5568,7 @@ is-binary-path@^1.0.0: | |
dependencies: | ||
binary-extensions "^1.0.0" | ||
|
||
is-buffer@^1.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5, is-buffer@~1.1.2: | ||
is-buffer@^1.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5: | ||
version "1.1.6" | ||
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" | ||
|
||
|
@@ -6482,7 +6462,7 @@ json-stable-stringify-without-jsonify@^1.0.1: | |
version "1.0.1" | ||
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" | ||
|
||
json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: | ||
json-stable-stringify@^1.0.1: | ||
version "1.0.1" | ||
resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" | ||
dependencies: | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this needs to be removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does need to be removed. I'll be honestly, I'm not sure why exactly, but something angular-translate was doing required this. Prior to removing this, the tests failed with an error related to there being nothing to flush, and since this line was added in the original PR and tests now pass without it, it seemed unnecessary. If this was not a test file, I would have dug into it more to understand what's going on, but it just didn't feel worth digging deep into since my goal here is essentially to undo that original PR anyway.