Skip to content

Commit

Permalink
Update after plugin folder layout changes in Kibana
Browse files Browse the repository at this point in the history
This require to use <kibana_root>/data for registered translations
and i18n plugin moved to core_plugins from plugins.

Refer to PR for more details:
elastic#7562
  • Loading branch information
hickeyma committed Oct 24, 2016
1 parent e78bfae commit fe8d2a8
Show file tree
Hide file tree
Showing 16 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ selenium
*.swp
*.swo
*.out
fixtures/translations
data/translations
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import process from 'child_process';
import Promise from 'bluebird';

const PATH_SEPARATOR = path.sep;
const DATA_PATH = __dirname + PATH_SEPARATOR + 'fixtures';
const DATA_PATH = __dirname + PATH_SEPARATOR + 'data';
const TRANSLATION_BACKUP_PATH = DATA_PATH + '/translations_backup';

const translationStorePath = i18n.getTranslationStoragePath();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ const mkdirpAsync = Promise.promisify(mkdirp);

const PATH_SEPARATOR = path.sep;
const TRANSLATION_FILE_EXTENSION = 'json';
const TRANSLATION_STORE_PATH = kibanaPackage.__dirname + PATH_SEPARATOR + 'fixtures' + PATH_SEPARATOR + 'translations';
const TRANSLATION_STORE_PATH = kibanaPackage.__dirname + PATH_SEPARATOR + 'data' + PATH_SEPARATOR + 'translations';

//TODO(hickeyma): Update to use https://github.com/elastic/kibana/pull/7562
const getTranslationStoragePath = function () {
return TRANSLATION_STORE_PATH;
};
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Promise from 'bluebird';
import { mkdirp as mkdirpNode } from 'mkdirp';
import manageUuid from './server/lib/manage_uuid';
import fs from 'fs';
import i18nPlugin from '../../plugins/i18n/server/i18n/index';
import i18nPlugin from '../i18n/server/i18n/index';
import ingest from './server/routes/api/ingest';
import kibanaPackage from '../../utils/package_json';
import Promise from 'bluebird';
Expand Down
2 changes: 1 addition & 1 deletion src/ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import UiExports from './ui_exports';
import UiBundle from './ui_bundle';
import UiBundleCollection from './ui_bundle_collection';
import UiBundlerEnv from './ui_bundler_env';
import i18nPlugin from '../plugins/i18n/server/i18n/index';
import i18nPlugin from '../core_plugins/i18n/server/i18n/index';
import langParser from 'accept-language-parser';

let kibanaTranslations = [];
Expand Down

0 comments on commit fe8d2a8

Please sign in to comment.