fix bug where french drupal6 pages use english term names

demetrios-koziris · Dec 27, 2016 · ad64002 · ad64002
1 parent 41411c9
commit ad64002
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/js/addProfLinks.js b/src/js/addProfLinks.js
@@ -17,8 +17,6 @@ The GNU General Public License can also be found at <http://www.gnu.org/licenses
 
 function makeProfLinks() {
 
-
-
     terms = {
         'Fall': {
             'code': 9,
@@ -62,24 +60,19 @@ function makeProfLinks() {
         }
 
         for (let termKey in terms) {
-
-            const profsTermSource = profsFullSource.split("(" + termKey + ")");
+            termName = ( isNewStyle ? termKey : termNames[lang][terms[termKey].code] );
+            const profsTermSource = profsFullSource.split("(" + termName + ")");
             if (profsTermSource.length > 1) {
                 profsForTerm = profsTermSource[0].split(",");
 
                 for (let p=0; p<profsForTerm.length; p++) {
 
                     let newProfObject = generateProfObject(minervaProfs, profsForTerm[p], termKey);
-                    if (newProfObject.key in profs) {
-                        // add term to prof object
-                        profs[newProfObject.key].termsTeaching[termKey] = terms[termKey];
-                        console.log(terms[termKey]);
-                    }
-                    else {
+                    if (!(newProfObject.key in profs)) {
                         profs[newProfObject.key] = newProfObject;
-                        profs[newProfObject.key].termsTeaching[termKey] = terms[termKey];
-                        console.log(newProfObject);
                     }
+                    // add term info to prof object
+                    profs[newProfObject.key].termsTeaching[termKey] = terms[termKey];
                 }
                 profsFullSource = profsTermSource[1];
             }

diff --git a/src/manifest.json b/src/manifest.json
@@ -2,7 +2,7 @@
   "name": "McGill Enhanced",
   "author": "Demetrios Koziris",
   "manifest_version": 2,
-  "version": "3.0.28",
+  "version": "3.0.289",
   "description": "Enhance the functionality of McGill.ca",
   "permissions" : [
     "declarativeContent",