@iobroker/socket-classes 0.4.6 → 0.4.7

package/README.md

@@ -69,6 +69,9 @@ io.close();
 -->
 
 ## Changelog
+### 0.4.7 (2022-06-20)
+* (bluefox) Allowed to overload system language
+
 ### 0.4.6 (2022-06-20)
 * (bluefox) updated `passport`
 

package/lib/socketCommands.js

@@ -217,6 +217,10 @@ class SocketCommands {
         if (socket && socket.subscribe && socket.subscribe[type] && this._updateSession(socket)) {
             return !!socket.subscribe[type].find(sub => {
                 if (sub.regex.test(id)) {
+                    // replace language
+                    if (this.adapter._language && id === 'system.config' && obj.common) {
+                        obj.common.language = this.adapter._language;
+                    }
                     socket.emit(type, id, obj);
                     return true;
                 }
@@ -1028,8 +1032,13 @@ class SocketCommands {
     __initCommandsObjects() {
         this.commands['getObject'] = (socket, id, callback) => {
             if (this._checkPermissions(socket, 'getObject', callback, id)) {
-                this.adapter.getForeignObject(id, {user: socket._acl.user}, (err, ...args) =>
-                    SocketCommands._fixCallback(callback, err, ...args));
+                this.adapter.getForeignObject(id, {user: socket._acl.user}, (err, obj) => {
+                    // overload language from current instance
+                    if (this.adapter._language && id === 'system.config' && obj.common) {
+                        obj.common.language = this.adapter._language;
+                    }
+                    SocketCommands._fixCallback(callback, err, obj);
+                });
             }
         };
 
@@ -1038,6 +1047,11 @@ class SocketCommands {
             if (this._checkPermissions(socket, 'getObjects', callback)) {
                 this.adapter.getForeignObjects('*', 'state', 'rooms', {user: socket._acl.user}, (err, objs) => {
                     if (typeof callback === 'function') {
+                        // overload language
+                        if (this.adapter._language && objs['system.config'] && objs['system.config'].common) {
+                            objs['system.config'].common.language = this.adapter._language;
+                        }
+
                         callback(err, objs);
                     } else {
                         this.adapter.log.warn('[getObjects] Invalid callback');

package/lib/socketCommon.js

@@ -18,6 +18,7 @@ class SocketCommon {
         this.infoTimeout  = null;
         this.eventHandlers = {};
         this.store        = null; // will be set in __initAuthentication
+        this.adapter._language = this.settings.language;
     }
 
     __getIsNoDisconnect() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",