Merge PWA - Meeds-io/MIPs#134 (#46)

Meeds-io · Aug 22, 2024 · abae93f · abae93f
2 parents ca2d9d0 + 7b69a5a
commit abae93f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/gamification-crowdin-webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/gamification-crowdin-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -20,10 +20,7 @@
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 -->
-<gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_4 http://www.exoplatform.org/xml/ns/gatein_resources_1_4"
-                  xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_4">
-
+<gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_5 http://www.exoplatform.org/xml/ns/gatein_resources_1_5" xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_5">
 
     <module>
         <name>engagementCenterActionsCrowdinExtensions</name>

diff --git a/gamification-crowdin-webapp/src/main/webapp/WEB-INF/web.xml b/gamification-crowdin-webapp/src/main/webapp/WEB-INF/web.xml
@@ -44,6 +44,7 @@
     <url-pattern>*.css</url-pattern>
     <url-pattern>*.js</url-pattern>
     <url-pattern>*.html</url-pattern>
+    <url-pattern>/i18n/*</url-pattern>
     <url-pattern>/images/*</url-pattern>
   </filter-mapping>
 

diff --git a/gamification-crowdin-webapp/src/main/webapp/vue-app/connectorExtensions/extensions.js b/gamification-crowdin-webapp/src/main/webapp/vue-app/connectorExtensions/extensions.js
@@ -26,7 +26,7 @@ export function init() {
     rank: 40,
     init: () => {
       const lang = window.eXo?.env?.portal?.language || 'en';
-      const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.CrowdinWebHookManagement-${lang}.json`;
+      const url = `/gamification-crowdin/i18n/locale.portlet.CrowdinWebHookManagement?lang=${lang}`;
       return exoi18n.loadLanguageAsync(lang, url);
     }
   });

diff --git a/...owdin-webapp/src/main/webapp/vue-app/crowdinUserConnectorExtension/js/crowdinConnector.js b/...owdin-webapp/src/main/webapp/vue-app/crowdinUserConnectorExtension/js/crowdinConnector.js
@@ -27,7 +27,7 @@ export default {
   PROFILE_BASER_URL: 'https://crowdin.com',
   init: () => {
     const lang = window.eXo?.env?.portal?.language || 'en';
-    const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.CrowdinWebHookManagement-${lang}.json`;
+    const url = `/gamification-crowdin/i18n/locale.portlet.CrowdinWebHookManagement?lang=${lang}`;
     return exoi18n.loadLanguageAsync(lang, url);
   },
   openOauthPopup(connector) {