finalisation allemand

static/js/clavier.js

@@ -335,25 +335,24 @@ function writeGraph(graph,phon){
 
     // GESTION PROSODIE
     var stress = ''; // ajout du stress si besoin
-    if (thisPageLang=="en") {
-        if (stress1) {
-            stress = " stress1"
-            toggleStress1()
-        }
-        else if (stress2) {
-            stress = " stress2"
-            toggleStress2()
-        }
-        //if (phon in ["phon_schwa","phon_schwi","phon_schwu","phon_schwju"]) stress = " schwa"
-        else if (phon == "phon_schwa" || phon == "phon_schwi" || phon == "phon_schwu" || phon == "phon_schwju") {
-            if (stress1) toggleStress1
-            if (stress2) toggleStress2
-            stress = " schwa"
-        }
-        else {
-            stress = " unstressed"
-        }
+    if (stress1) {
+        stress = " stress1"
+        toggleStress1()
     }
+    else if (stress2) {
+        stress = " stress2"
+        toggleStress2()
+    }
+    //if (phon in ["phon_schwa","phon_schwi","phon_schwu","phon_schwju"]) stress = " schwa"
+    else if (phon == "phon_schwa" || phon == "phon_schwi" || phon == "phon_schwu" || phon == "phon_schwju" || phon == "phon_schw6") {
+        if (stress1) toggleStress1
+        if (stress2) toggleStress2
+        stress = " schwa"
+    }
+    else {
+        stress = " unstressed"
+    }
+    
 
     // SI LIAISON INTERNE (ex. février) : noTextClip
     var textClip = "";

static/js/clavierCalques.js

@@ -6,7 +6,7 @@ var cpsg = document.getElementById('btn-cpsg');
 var pngPochoir = document.getElementById('pngPochoir');
 var pngCalq = document.getElementById('pngCalq');
 
-let famille = "bouches"
+
 setKeyboards('black');
 
 function setKeyboards(bgColor) {

static/js/id2class.js

@@ -102,6 +102,7 @@ var id2class = {
 
 var bicol2colcol = {
   "phon_a_majr":["--phon_a_maj","--phon_r_slash"],
+  "phon_a_maju_maj":["--phon_a_maj","--phon_u_maj"],
   "phon_ai_maj":["--phon_a","--phon_i_maj"],
   "phon_ai_majarobase":["--phon_a","--phon_i_maj","--phon_schwa"],
   "phon_au_maj":["--phon_a","--phon_u_maj"],

static/js/interface.js

@@ -2,6 +2,7 @@ const thisURL = window.location.href;
 console.log("url:",thisURL);
 
 var thisPageLang = "";
+let famille = "bouches";
 
 
 // set page target language
@@ -201,6 +202,10 @@ function selectPanneau(p){
     var svgClickDeAlem = document.getElementById('svgClickDeAlem'); // Panneau DE ALeM (zones clickables)
 
     function resetPanneaux() {
+
+        // INTERLANGUE
+        famille = "formes";
+
         // FR DO
         doCalques.style.display = 'none';
         pngCalq.style.display = 'none';
@@ -270,6 +275,8 @@ function selectPanneau(p){
         pngPochoir.style.display = 'block';
         svgFond.style.display = 'block';
 
+        famille="bouches";
+
     } else if (p == 'svgFrKinephones') {
         resetPanneaux();
 
@@ -373,6 +380,8 @@ function selectPanneau(p){
         svgBackDeAlem.style.display = 'block';
         pngPochoirDeAlem.style.display = 'block';
         svgClickDeAlem.style.display = 'block';
+
+        famille="bouches";
     
     }
 }
@@ -421,7 +430,8 @@ function interface(lang) {
 
         document.getElementById('svgEnPronSciBr').style.display = "none";
         document.getElementById('btnSwitchStress').style.display = "none";
-        document.getElementsByClassName('btnPros')[0].style.display = "none";
+        document.getElementById('btnStress1').style.display = "none";
+        document.getElementById('btnStress2').style.display = "none";
 
         document.getElementById('textZone').style.direction = "ltr";
         document.getElementById('textZoneBack').classList.remove('justify-content-end')
@@ -444,7 +454,8 @@ function interface(lang) {
         initInterface();
 
         document.getElementById('btnSwitchStress').style.display = "";
-        document.getElementsByClassName('btnPros')[0].style.display = "";
+        document.getElementById('btnStress1').style.display = "";
+        document.getElementById('btnStress2').style.display = "";
 
         // Indiquer le lien de Page Vierge
         document.getElementById('hrefNewPage').href = thisRawURL+'en/';
@@ -495,6 +506,9 @@ function interface(lang) {
     
     } else if (lang == "de") {
         initInterface();
+
+        document.getElementById('btnSwitchStress').style.display = "";
+        document.getElementById('btnStress1').style.display = "";
         
         // Indiquer le lien de Page Vierge
         document.getElementById('hrefNewPage').href = thisRawURL+'de/';

static/languages/languages.js

@@ -354,10 +354,10 @@ var langJson = {
     "ti_toggleFullScreen": {
         "fr": "Mode plein écran",
         "en": "Full screen mode",
-        "zh": "",
-        "dz": "",
-        "shy": "",
-        "de": ""
+        "zh": "Full screen mode",
+        "dz": "Full screen mode",
+        "shy": "Full screen mode",
+        "de": "Full screen mode"
     },
     "ti_checkWord": {
         "fr": "Vérifier dans le dictionnaire de WikiColor",