better handling of language selection when interacting with TEIGarage…

… API. Fixes #154
TEIC · Jul 23, 2024 · d9358eb · d9358eb
1 parent 5c4dfd0
commit d9358eb
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 22 deletions.
diff --git a/src/actions/index.js b/src/actions/index.js
@@ -91,10 +91,11 @@ export function exportOdd() {
   }
 }
 
-export function exportSchema(format) {
+export function exportSchema(format, lang) {
   return {
     type: EXPORT_SCHEMA,
-    format
+    format,
+    lang
   }
 }
 

diff --git a/src/components/DownloadButton.js b/src/components/DownloadButton.js
@@ -34,7 +34,7 @@ export default class DownloadButton extends Component {
           infoHeader: i18n('Generating the Customization'),
           infoBody: i18n('geninfo')
         })
-        this.props.downloadSchema(format)
+        this.props.downloadSchema(format, this.props.language)
       }
     }
 

diff --git a/src/containers/Download.js b/src/containers/Download.js
@@ -24,10 +24,10 @@ const mapDispatchToProps = (dispatch) => {
       // you don't want it to fire before the customization update is completed.
       dispatch(exportOdd())
     },
-    downloadSchema: (type) => {
+    downloadSchema: (type, lang) => {
       console.log(type)
       dispatch(updateCustomizationOdd())
-      dispatch(exportSchema(type))
+      dispatch(exportSchema(type, lang))
     }
   }
 }

diff --git a/src/containers/HomePage.js b/src/containers/HomePage.js
@@ -24,7 +24,7 @@ const mapDispatchToProps = (dispatch) => {
       dispatch(fetchOdd(url)).then((odd) => {
         // 1. Convert to JSON via TEIGarage
         dispatch(setLoadingStatus(i18n('2/3 Importing customization ODD...')))
-        dispatch(postToTEIGarage(odd.xml, teigarage.compile_json)).then(() => {
+        dispatch(postToTEIGarage(odd.xml, teigarage.compile_json(lang))).then(() => {
           dispatch(setLoadingStatus(i18n('3/3 Importing full specification source...')))
           // 2. Get p5subset.
           dispatch(fetchLocalSource(`${datasource}/p5subset.json`))

diff --git a/src/containers/SettingsPage.js b/src/containers/SettingsPage.js
@@ -79,8 +79,8 @@ const mapDispatchToProps = (dispatch) => {
       }
     },
     getNewDocForLang: (data, lang) => {
-      dispatch(compileWithTEIGarage(data, teigarage['compiled.odd'])).then((compiledOdd) => {
-        dispatch(postToTEIGarage(compiledOdd, teigarage.json.replace('%3Een%3C', `%3E${lang}%3C`)))
+      dispatch(compileWithTEIGarage(data, teigarage['compiled.odd'](lang))).then((compiledOdd) => {
+        dispatch(postToTEIGarage(compiledOdd, teigarage.json(lang)))
       })
     }
   }

diff --git a/src/reducers/index.js b/src/reducers/index.js
@@ -202,7 +202,7 @@ function odd(state = {}, action) {
       try {
         filename = state.customization.settings.filename
       } catch (e) { e }
-      postToTEIGarage(state.customization.updatedXml, teigarage[action.format])
+      postToTEIGarage(state.customization.updatedXml, teigarage[action.format](action.lang))
         .then((res) => {
           const ext = action.format !== 'rnc' ? action.format : 'zip'
           fileSaver.saveAs(new Blob([res], {'type': 'text\/xml'}), `${filename}.${ext}`)

diff --git a/src/utils/teigarage.js b/src/utils/teigarage.js