Merge pull request #791 from HappyTobi/tray

[FIX] Mac osx menubar color
RocketChat · Aug 4, 2018 · b602c93 · b602c93
2 parents ffe9045 + 02ee8d5
commit b602c93
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 33 deletions.
diff --git a/src/i18n/index.js b/src/i18n/index.js
@@ -5,6 +5,28 @@ import { app, remote } from 'electron';
 
 const eApp = app || remote.app;
 
+let loadedLanguage = [];
+
+/**
+ * Load singular and plural translation based on count
+ * @param {string} phrase The key fore the translation string
+ * @param {number} chount Count to check for singular / plural (0-1,2-n)
+ * @returns {string} Translation in user language
+ */
+function loadTranslation (phrase = '', count) {
+    const loadedLanguageTranslation = loadedLanguage[phrase];
+    let translation = loadedLanguageTranslation;
+    if (loadedLanguageTranslation === undefined) {
+        translation = phrase;
+    } else if (loadedLanguageTranslation instanceof Object) {
+        translation = loadedLanguageTranslation['one'];
+        if (count > 1) {
+            translation = loadedLanguageTranslation['multi'];
+        }
+    }
+    return translation;
+}
+
 class I18n {
     /**
      * Load users language if available, and fallback to english for any missing strings
@@ -16,11 +38,11 @@ class I18n {
             dir = path.join(__dirname, 'i18n/lang');
         }
         const defaultLocale = path.join(dir, 'en.i18n.json');
-        this.loadedLanguage = JSON.parse(fs.readFileSync(defaultLocale, 'utf8'));
+        loadedLanguage = JSON.parse(fs.readFileSync(defaultLocale, 'utf8'));
         const locale = path.join(dir, `${eApp.getLocale()}.i18n.json`);
         if (fs.existsSync(locale)) {
             const lang = JSON.parse(fs.readFileSync(locale, 'utf8'));
-            this.loadedLanguage = Object.assign(this.loadedLanguage, lang);
+            loadedLanguage = Object.assign(loadedLanguage, lang);
         }
     }
 
@@ -31,7 +53,19 @@ class I18n {
      * @return {string} Translation in users language
      */
     __ (phrase, ...replacements) {
-        const translation = this.loadedLanguage[phrase] ? this.loadedLanguage[phrase] : phrase;
+        const translation = loadTranslation(phrase, 0);
+        return util.format(translation, ...replacements);
+    }
+
+    /**
+     * Get translation string
+     * @param {string} phrase The key for the translation string
+     * @param {number} count Count to check for singular / plural (0-1,2-n)
+     * @param {...string|number} replacements List of replacements in template strings
+     * @return {string} Translation in users language
+     */
+    pluralize (phrase, count, ...replacements) {
+        const translation = loadTranslation(phrase, count);
         return util.format(translation, ...replacements);
     }
 }

diff --git a/src/scripts/tray.js b/src/scripts/tray.js
@@ -21,10 +21,40 @@ const icons = {
 };
 
 const statusBullet = {
-    online: '\u001B[32m•\u001B[0m',
-    away: '\u001B[33m•\u001B[0m',
-    busy: '\u001B[31m•\u001B[0m',
-    offline: '\u001B[30m•\u001B[0m'
+    online: '\u001B[32m•',
+    away: '\u001B[33m•',
+    busy: '\u001B[31m•',
+    offline: '\u001B[30m•'
+};
+
+const messageCountColor = {
+    white: '\u001B[37m',
+    black: '\u001B[0m'
+};
+
+function getTrayImagePath (badge) {
+    let iconFilename;
+    if (badge.title === '•') {
+        iconFilename = "icon-tray-dot";
+    } else if (!isNaN(parseInt(badge.title)) && badge.title > 0) {
+        if (badge.title > 9) {
+            iconFilename = "icon-tray-9plus";
+        } else {
+            iconFilename = `icon-tray-${badge.count}`;
+        }
+    } else if (badge.showAlert) {
+        iconFilename = "icon-tray-alert";
+    } else {
+        iconFilename = "icon-tray-Template";
+    }
+
+    if (process.platform === 'win32') {
+        iconFilename += ".ico";
+    } else {
+        iconFilename += ".png";
+    }
+
+    return path.join(__dirname, 'images', icons[process.platform].dir, iconFilename);
 }
 
 function createAppTray () {
@@ -96,31 +126,6 @@ function createAppTray () {
     };
 }
 
-function getTrayImagePath (badge) {
-    let iconFilename;
-    if (badge.title === '•') {
-        iconFilename = "icon-tray-dot";
-    } else if (!isNaN(parseInt(badge.title)) && badge.title > 0) {
-        if (badge.title > 9) {
-            iconFilename = "icon-tray-9plus";
-        } else {
-            iconFilename = `icon-tray-${badge.count}`;
-        }
-    } else if (badge.showAlert) {
-        iconFilename = "icon-tray-alert";
-    } else {
-        iconFilename = "icon-tray-Template";
-    }
-
-    if (process.platform === 'win32') {
-        iconFilename += ".ico";
-    } else {
-        iconFilename += ".png";
-    }
-
-    return path.join(__dirname, 'images', icons[process.platform].dir, iconFilename);
-}
-
 function showTrayAlert (badge, status = 'online') {
     if (mainWindow.tray === null || mainWindow.tray === undefined) {
         return;
@@ -129,7 +134,11 @@ function showTrayAlert (badge, status = 'online') {
     mainWindow.flashFrame(badge.showAlert);
 
     if (process.platform === 'darwin') {
-        mainWindow.tray.setTitle(`${statusBullet[status]}${badge.count}`);
+        let countColor = messageCountColor['black'];
+        if (remote.systemPreferences.isDarkMode()) {
+            countColor = messageCountColor['white'];
+        }
+        mainWindow.tray.setTitle(`${statusBullet[status]} ${countColor}${badge.count}`);
     }
 }