Merge pull request #4934 from owncloud/08042021_import-ods-translations

Import ODS translations & merge with web translations

changelog/unreleased/enhancement-use-ods-translations

@@ -0,0 +1,7 @@
+Enhancement: Use ODS translations
+
+Some ODS components were using their own translation strings which were availabel in the ODS but 
+not exported there/imported in the web project. Now, we import the translation strings from the ODS package 
+and merge them with the web translations.
+
+https://github.com/owncloud/web/pull/4934

packages/web-runtime/src/index.js

@@ -25,6 +25,7 @@ import Vue2TouchEvents from 'vue2-touch-events'
 // --- Gettext ----
 import GetTextPlugin from 'vue-gettext'
 import coreTranslations from '../l10n/translations.json'
+import odsTranslations from 'owncloud-design-system/dist/system/translations.json'
 
 // --- Image source ----
 import MediaSource from './plugins/mediaSource.js'
@@ -47,6 +48,8 @@ import { registerClient } from './services/clientRegistration'
 import { loadConfig } from './helpers/config'
 import { loadTheme } from './helpers/theme'
 
+import merge from 'lodash-es/merge'
+
 wgxpath.install()
 
 Vue.prototype.$client = new OwnCloud()
@@ -81,7 +84,8 @@ const supportedLanguages = {
  it: 'Italiano',
  gl: 'Galego'
 }
-const translations = coreTranslations
+
+const translations = merge({}, coreTranslations, odsTranslations)
 
 const loadApp = async path => {
  const app = await new Promise((resolve, reject) =>