Skip to content

Commit 0aa62e6

Browse files
committed
fix i18n error when reloading
1 parent 1240a25 commit 0aa62e6

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

generators/app/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ module.exports = yeoman.Base.extend({
151151
this.frontendBuilder = jhipsterVar.frontendBuilder;
152152
this.buildTool = jhipsterVar.buildTool;
153153
this.databaseType = jhipsterVar.databaseType;
154+
this.enableTranslation = jhipsterVar.enableTranslation;
154155
this.changelogDate = jhipsterFunc.dateFormatForLiquibase();
155156
this.webappDir = jhipsterVar.webappDir;
156157
this.javaTemplateDir = 'src/main/java/package';
@@ -304,8 +305,8 @@ module.exports = yeoman.Base.extend({
304305
jhipsterFunc.addBowerDependency('angular-object-diff', '1.0.3');
305306
jhipsterFunc.addAngularJsModule('ds.objectDiff');
306307
// add new menu entry
307-
jhipsterFunc.addElementToAdminMenu('entity-audit', 'list-alt', jhipsterVar.enableTranslation);
308-
jhipsterFunc.addTranslationKeyToAllLanguages('entity-audit', 'Entity Audit', 'addAdminElementTranslationKey', jhipsterVar.enableTranslation);
308+
jhipsterFunc.addElementToAdminMenu('entity-audit', 'list-alt', this.enableTranslation);
309+
jhipsterFunc.addTranslationKeyToAllLanguages('entity-audit', 'Entity Audit', 'addAdminElementTranslationKey', this.enableTranslation);
309310

310311
}
311312

generators/app/templates/src/main/webapp/app/admin/entity-audit/_entity-audit.state.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@
2121
controller: 'EntityAuditController',
2222
controllerAs: 'vm'
2323
}
24-
},
25-
resolve: { }
24+
}<% if (enableTranslation) { %>,
25+
resolve: {
26+
translatePartialLoader: ['$translate', '$translatePartialLoader', function ($translate, $translatePartialLoader) {
27+
$translatePartialLoader.addPart('global');
28+
return $translate.refresh();
29+
}]
30+
}<% } %>
2631
});
2732
}
2833
})();

0 commit comments

Comments
 (0)