Merge branch 'proxmox:master' into master

wy414012 · Nov 14, 2024 · bb54afc · bb54afc
2 parents c804da2 + b67c450
commit bb54afc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
@@ -148,16 +148,15 @@ Ext.define('PVE.tree.ResourceTree', {
     },
 
     getToolTip: function(info) {
-	if (info.type === 'pool' || info.groupbyid !== undefined) {
-	    return undefined;
+	let qtips = [];
+	if (info.qmpstatus || info.status) {
+	    qtips.push(Ext.String.format(gettext('Status: {0}'), info.qmpstatus || info.status));
 	}
-
-	let qtips = [gettext('Status') + ': ' + (info.qmpstatus || info.status)];
 	if (info.lock) {
 	    qtips.push(Ext.String.format(gettext('Config locked ({0})'), info.lock));
 	}
 	if (info.hastate !== 'unmanaged') {
-	    qtips.push(gettext('HA State') + ": " + info.hastate);
+	    qtips.push(Ext.String.format(gettext('HA State: {0}'), info.hastate));
 	}
 	if (info.type === 'storage') {
 	    let usage = info.disk / info.maxdisk;
@@ -166,6 +165,10 @@ Ext.define('PVE.tree.ResourceTree', {
 	    }
 	}
 
+	if (qtips.length === 0) {
+	    return undefined;
+	}
+
 	let tip = qtips.join(', ');
 	info.tip = tip;
 	return tip;

diff --git a/www/mobile/WidgetToolkitUtils.js b/www/mobile/WidgetToolkitUtils.js
@@ -67,6 +67,7 @@ utilities: {
 
     language_map: { //language map is sorted alphabetically by iso 639-1
 	ar: `العربية - ${gettext("Arabic")}`,
+	bg: `Български - ${gettext("Bulgarian")}`,
 	ca: `Català - ${gettext("Catalan")}`,
 	da: `Dansk - ${gettext("Danish")}`,
 	de: `Deutsch - ${gettext("German")}`,