diff --git a/gulp/build.js b/gulp/build.js
index a5183ff..cff3aec 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -45,6 +45,9 @@ gulp.task('html', ['inject', 'partials'], function () {
     .pipe($.rev())
     .pipe(jsFilter)
     .pipe($.replace('assets/images/', noosferoThemePrefix + 'assets/images/'))
+    .pipe($.replace('/languages/', noosferoThemePrefix + 'languages/'))
+    .pipe($.replace('bower_components/angular-i18n/', noosferoThemePrefix + 'locale/angular-i18n/'))
+    .pipe($.replace('bower_components/moment/', noosferoThemePrefix + 'locale/moment/'))
     .pipe($.sourcemaps.init())
     .pipe($.ngAnnotate())
     .pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify'))
@@ -81,6 +84,14 @@ gulp.task('fonts', function () {
     .pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/')));
 });
 
+gulp.task('locale', function () {
+  return gulp.src([
+    path.join("bower_components/angular-i18n", '*.js'),
+    path.join("bower_components/moment/locale", '*.js'),
+  ], {base: 'bower_components/'})
+    .pipe(gulp.dest(path.join(conf.paths.dist, '/locale/')));
+});
+
 gulp.task('other', function () {
   var fileFilter = $.filter(function (file) {
     return file.stat.isFile();
@@ -98,4 +109,4 @@ gulp.task('clean', function () {
   return $.del([path.join(conf.paths.dist, '/'), path.join(conf.paths.tmp, '/')]);
 });
 
-gulp.task('build', ['html', 'fonts', 'other']);
+gulp.task('build', ['html', 'fonts', 'other', 'locale']);
diff --git a/src/app/components/language-selector/language-selector.component.ts b/src/app/components/language-selector/language-selector.component.ts
index 751ccd6..5e5663c 100644
--- a/src/app/components/language-selector/language-selector.component.ts
+++ b/src/app/components/language-selector/language-selector.component.ts
@@ -35,7 +35,6 @@ export class LanguageSelector {
     private changeMomentLocale(language: string) {
         let localePromise = Promise.resolve();
         if (language != "en") {
-            // FIXME fix locale path
             localePromise = this.angularLoad.loadScript(`/bower_components/moment/locale/${language}.js`);
         }
         localePromise.then(() => {
diff --git a/src/app/index.config.ts b/src/app/index.config.ts
index a7934ec..85528ae 100644
--- a/src/app/index.config.ts
+++ b/src/app/index.config.ts
@@ -32,7 +32,6 @@ function configTranslation($translateProvider: angular.translate.ITranslateProvi
     $translateProvider.useMissingTranslationHandlerLog();
     $translateProvider.preferredLanguage('en');
     $translateProvider.useSanitizeValueStrategy('escape');
-    //FIXME fix location pattern
     tmhDynamicLocaleProvider.localeLocationPattern('bower_components/angular-i18n/angular-locale_{{locale}}.js');
     tmhDynamicLocaleProvider.useCookieStorage();
 }
--
libgit2 0.21.2