fixes in-context translation + fixes migration 20160704095606

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Changed some default values for new installations
 - Compatible database with Fab-manager v1, to allow upgrades
 - Updated documentation
+- Changed In-Context pseudo-language to Zulu instead of Acholi
 - Fix a bug: installation without nginx does not remove the service from the docker-compose file
 - Fix a bug: default twitter feed is invalid
 - Fix a bug: default nginx configuration does not allows secure cookies
@@ -12,6 +13,7 @@
 - Fix a bug: invalid link to upgrade procedure
 - Fix a bug: unable to access health endpoint
 - Fix a bug: migration 20160704095606 cannot run due to GDPR refactoring
+- Fix a bug: in-context translation is not working
 
 ## v4.3.3 2020 April 1st
 

app/assets/javascripts/app.js

@@ -64,6 +64,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout
       $translateProvider.useMessageFormatInterpolation();
       // Set the language of the instance (from ruby configuration)
       $translateProvider.preferredLanguage(Fablab.locale);
+      // In any cases, fallback to english
+      $translateProvider.fallbackLanguage('en');
       // End the tour when the user clicks the forward or back buttons of the browser
       TourConfigProvider.enableNavigationInterceptors();
     }]).run(['$rootScope', '$log', 'AuthService', 'Auth', 'amMoment', '$state', 'editableOptions', 'Analytics',

config/initializers/i18n.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# we allow the Zulu locale (zu) as it is used for In-Context translation
+# @see https://support.crowdin.com/in-context-localization/
+I18n.config.available_locales = :zu

db/migrate/20160704095606_create_wallets.rb

@@ -11,8 +11,8 @@ class CreateWallets < ActiveRecord::Migration[4.2]
 
     # create all wallets
     execute <<-SQL
-      INSERT INTO wallets (user, amount, created_at, updated_at)
+      INSERT INTO wallets (user_id, amount, created_at, updated_at)
-      SELECT users.id, 0, #{DateTime.current.iso8601}, #{DateTime.current.iso8601}
+      SELECT users.id, 0, '#{DateTime.current.iso8601}', '#{DateTime.current.iso8601}'
       FROM users
     SQL
   end

doc/environment.md

@@ -366,7 +366,7 @@ See [Microsoft support](https://support.microsoft.com/en-us/kb/264372) for a lis
 
 If set to `true`, and the application in started into a staging environment, this will enable the Crowdin In-context translation layer for the front-end application.
 See [Crowdin documentation](https://support.crowdin.com/in-context-localization/) for more details about this.
-Accordingly, `RAILS_LOCALE` and `APP_LOCALE` must be configured to `ach`.
+Accordingly, `RAILS_LOCALE` and `APP_LOCALE` must be configured to `zu`.
 <a name="open-projects-settings"></a>
 ## OpenLab settings
 <a name="OPENLAB_APP_ID"></a><a name="OPENLAB_APP_SECRET"></a>