Merge pull request #3157

beta
mainIine · Jan 13, 2025 · bb33048 · bb33048
2 parents f09b10e + af6ee85
commit bb33048
Show file tree

Hide file tree

Showing 29 changed files with 989 additions and 328 deletions.
diff --git a/background.js b/background.js
@@ -14,9 +14,11 @@
 
 'use strict';
 
-importScripts(
-	'vendor/browser-polyfill/browser-polyfill.min.js','vendor/dexie/dexie.min.js'
-)
+try {
+	importScripts('vendor/browser-polyfill/browser-polyfill.min.js','vendor/dexie/dexie.min.js')
+}
+catch {	
+}
 
 // @ts-ignore
 let alertsDB = new Dexie("Alerts");
@@ -247,17 +249,20 @@ alertsDB.version(1).stores({
 		function triggerAlert(alert) {
 			return browser.notifications.create(
 				alert.id != null ? (prefix + alert.id) : previevId,
-				{
-					type: 'basic',
-					title: alert.data.title,
-					message: alert.data.body,
-					buttons: alert.data.actions,
-					requireInteraction: alert.data.persistent||false,
-					// @ts-ignore
-					contextMessage: 'FoE-Helper − '+trimPrefix(alert.server, "https://"),
-					iconUrl: '/images/app128.png',
-					eventTime: alert.data.expires
-				}
+				Object.assign(navigator.userAgent.indexOf("Firefox") > -1 ? {}: 
+					{
+						requireInteraction: alert.data.persistent||false,
+						buttons: alert.data.actions
+					}, {
+						type: 'basic',
+						title: alert.data.title,
+						message: alert.data.body,
+						iconUrl: '/images/app128.png',
+						eventTime: alert.data.expires,
+						contextMessage: 'FoE-Helper − '+trimPrefix(alert.server, "https://")
+
+					}
+				)
 			);
 		}
 

diff --git a/changelog-de.md b/changelog-de.md
@@ -1,5 +1,29 @@
 ## Changelog - Extension
 
+##### 3.10.1.0
+
+**Update**
+- Tooltip
+	- 'Einmalige Gebäude' Eigenschaft hinzugefügt
+
+**BugFix**
+- Alarme gingen immer noch nicht
+- Effizienz 
+	- Gebäude mit Verbündeten zeigten falsche Anzahl
+- Markt Übersicht
+	- Filterliste überlagerte Tabellenkopf
+- Gildenkassenbeiträge
+	- Beim Export wurde das Datum nicht korrekt gelesen
+- Blaue Galaxie und Gebäudeeffizienz
+	- Fenster gingen manchmal nicht auf oder waren leer (ist noch in Untersuchung ob die Reparatur geklappt hat)
+- Tooltip
+	- "motivieren"/"polieren" Eigenschaft war falsch herum für Gebäude der neuen Generation
+
+##### 3.10.0.1
+
+**BugFix**
+- Alarme gingen nicht
+
 ##### 3.10.0.0
 
 **Neu**

diff --git a/changelog-en.md b/changelog-en.md
@@ -1,5 +1,29 @@
 ## Changelog - Extension
 
+##### 3.10.1.0
+
+**Update**
+- Tooltip
+	- added 'Unique Building' trait
+
+**BugFix**
+- Alerts still did not work
+- Efficiency 
+	- fix count for buildings with allies
+- Market Overview
+	- filter overlapped by table header
+- Treasury
+	- export did not parse date correctly
+- Blue Galaxy and Building Efficiency
+	- sometimes Boxes did not open or were empty (still under Observation if the fix worked)
+- Tooltip
+	- "motivate"/"polish" traits were mixed up for buildings of the new generation
+
+##### 3.10.0.1
+
+**BugFix**
+- Alerts did not work
+
 ##### 3.10.0.0
 
 **New**

diff --git a/css/web/boxes.css b/css/web/boxes.css
@@ -1494,7 +1494,7 @@ FP-Bar */
 	opacity: 0;
 	visibility: hidden;
 	pointer-events: none;
-	z-index: 2;
+	z-index: 201;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;

diff --git a/js/inject.js b/js/inject.js
@@ -172,7 +172,7 @@ function inject (loadBeta = false, extUrl = chrome.runtime.getURL(''), betaDate=
 
 			// Firefox does not support direct communication with background.js but API injections
 			// So the the messages have to be forwarded and this exports an API-Function to do so
-			if (!chrome.extension && exportFunction && window.wrappedJSObject) {
+			if (window.navigator.userAgent.indexOf("Firefox") > -1 && exportFunction && window.wrappedJSObject) {
 				function callBgApi(data) {
 					return new window.Promise(
 						exportFunction(

diff --git a/js/web/_i18n/cs.json b/js/web/_i18n/cs.json
@@ -962,10 +962,10 @@
     "Boxes.Stats.SourceTitle.statsRewards": "Vaše odměny z Hradu Himedži, Chrámu relikvií, Cechovních bitev",
     "Boxes.Stats.SourceTitle.statsTreasureClanD": "Pokladnice cechu - denní přehled",
     "Boxes.Stats.SourceTitle.statsTreasureClanH": "Pokladnice cechu - hodinový přehled",
-    "Boxes.Stats.SourceTitle.statsTreasurePlayerD": "Vaše vklady do Pokladnice cechu - denní",
-    "Boxes.Stats.SourceTitle.statsTreasurePlayerH": "Vaše vklady do Pokladnice cechu - hodinové",
-    "Boxes.Stats.SourceTitle.statsUnitsD": "Vaše Jednotky - denně",
-    "Boxes.Stats.SourceTitle.statsUnitsH": "Vaše Jednotky - hodinově",
+    "Boxes.Stats.SourceTitle.statsTreasurePlayerD": "Váš sklad zboží - denní přehled",
+    "Boxes.Stats.SourceTitle.statsTreasurePlayerH": "Váš sklad zboží - hodinový přehled",
+    "Boxes.Stats.SourceTitle.statsUnitsD": "Vaše jednotky - denní přehled",
+    "Boxes.Stats.SourceTitle.statsUnitsH": "Vaše Jednotky - hodinový přehled",
     "Boxes.Stats.Title": "Přehled statistik",
     "Boxes.Technologies.DescInStock": "Dostupné",
     "Boxes.Technologies.DescRequired": "Požadováno",
@@ -1304,7 +1304,7 @@
     "Settings.Show2kQuestMark.Desc": "Zobrazuje malý odznak s počítadlem počtu úkolů, které ještě můžete odmítnout.",
     "Settings.Show2kQuestMark.Title": "2000 značek úkolů",
     "Settings.ShowArmyAdvice.Button": "Nastavení rad",
-	"Settings.ShowArmyAdvice.Desc": "Zobrazuje rady (přidané hráčem) pro konkrétní nepřátelské armády.",
+    "Settings.ShowArmyAdvice.Desc": "Zobrazuje rady (přidané hráčem) pro konkrétní nepřátelské armády.",
     "Settings.ShowArmyAdvice.Title": "Zobrazit doporučení pro armádu",
     "Settings.ShowAztecHelper.Desc": "Má se otevřít okno „Aztécký pomocník\" při spuštění aztécké minihry?\"",
     "Settings.ShowAztecHelper.Title": "Máme otevřít okno \"Aztéckého pomocníka\" při startu Aztécké mini hry?",

diff --git a/js/web/_i18n/de.json b/js/web/_i18n/de.json
@@ -919,21 +919,21 @@
     "Boxes.Productions.Headings.amount": "Menge",
     "Boxes.Productions.Headings.area": "Fläche",
     "Boxes.Productions.Headings.clan_power_production": "Gildenmacht Produktion",
-    "Boxes.Productions.Headings.culture": "Kulturelle Gebäude",
-    "Boxes.Productions.Headings.decoration": "Dekorationen",
+    "Boxes.Productions.Headings.culture": "Kultur",
+    "Boxes.Productions.Headings.decoration": "Deko",
     "Boxes.Productions.Headings.earning": "Ernte",
     "Boxes.Productions.Headings.efficiency": "Effizienz",
     "Boxes.Productions.Headings.era": "Zeitalter",
-    "Boxes.Productions.Headings.generic_building": "Andere Gebäude",
-    "Boxes.Productions.Headings.goods": "Gütergebäude",
-    "Boxes.Productions.Headings.greatbuilding": "Legendäre Bauwerke",
+    "Boxes.Productions.Headings.generic_building": "Andere",
+    "Boxes.Productions.Headings.goods": "Güter",
+    "Boxes.Productions.Headings.greatbuilding": "LG",
     "Boxes.Productions.Headings.item": "Gegenstand",
     "Boxes.Productions.Headings.main_building": "Rathaus",
     "Boxes.Productions.Headings.name": "Name",
     "Boxes.Productions.Headings.number": "Anzahl",
     "Boxes.Productions.Headings.off_grid": "Spezialgebäude",
-    "Boxes.Productions.Headings.production": "Produktionsgebäude",
-    "Boxes.Productions.Headings.random_production": "Zufalls Produktionen",
+    "Boxes.Productions.Headings.production": "Produktionen",
+    "Boxes.Productions.Headings.random_production": "Zufall",
     "Boxes.Productions.Headings.residential": "Wohngebäude",
     "Boxes.Productions.Headings.size": "Größe",
     "Boxes.Productions.Headings.street": "Straßen",
@@ -1100,6 +1100,7 @@
     "Boxes.Tooltip.Building.noPlunder":"kann nicht geplündert werden",
     "Boxes.Tooltip.Building.lifeSupport":"beeinflusst durch Lebenserhaltung",
     "Boxes.Tooltip.Building.size+time":"Größe und Bauzeit",
+    "Boxes.Tooltip.Building.isUnique":"Einmaliges Gebäude",
     "Boxes.Treasury.Action": "Nachricht",
     "Boxes.Treasury.Amount": "Menge",
     "Boxes.Treasury.DateTime": "Datum/Uhrzeit",

diff --git a/js/web/_i18n/en.json b/js/web/_i18n/en.json
@@ -249,16 +249,16 @@
     "Boxes.CityMap.WholeArea": "Total Squares: ",
     "Boxes.CityMap.YourCity": "Your City",
     "Boxes.CityMap.clan_power_production": "Guild Power production",
-    "Boxes.CityMap.culture": "Cultural Buildings",
+    "Boxes.CityMap.culture": "Cultural",
     "Boxes.CityMap.decoration": "Decorations",
-    "Boxes.CityMap.generic_building": "Other Buildings",
-    "Boxes.CityMap.goods": "Goods Buildings",
-    "Boxes.CityMap.greatbuilding": "Great Buildings",
+    "Boxes.CityMap.generic_building": "Other",
+    "Boxes.CityMap.goods": "Goods",
+    "Boxes.CityMap.greatbuilding": "GBs",
     "Boxes.CityMap.main_building": "Town Hall",
-    "Boxes.CityMap.military": "Military Buildings",
-    "Boxes.CityMap.production": "Production Buildings",
-    "Boxes.CityMap.random_production": "Random Productions",
-    "Boxes.CityMap.residential": "Residential Buildings",
+    "Boxes.CityMap.military": "Military",
+    "Boxes.CityMap.production": "Production",
+    "Boxes.CityMap.random_production": "Random",
+    "Boxes.CityMap.residential": "Residential",
     "Boxes.CityMap.street": "Roads",
     "Boxes.CityMap.tower": "Towers",
     "Boxes.Citymap.Efficiency": "Efficiency",
@@ -919,23 +919,23 @@
     "Boxes.Productions.Headings.amount": "Qty",
     "Boxes.Productions.Headings.area": "Area",
     "Boxes.Productions.Headings.clan_power_production": "Guild Power",
-    "Boxes.Productions.Headings.culture": "Cultural Buildings",
+    "Boxes.Productions.Headings.culture": "Cultural",
     "Boxes.Productions.Headings.decoration": "Decorations",
     "Boxes.Productions.Headings.earning": "Collection",
     "Boxes.Productions.Headings.efficiency": "Efficiency",
     "Boxes.Productions.Headings.era": "Era",
-    "Boxes.Productions.Headings.generic_building": "Other bulidings",
-    "Boxes.Productions.Headings.goods": "Goods Buildings",
+    "Boxes.Productions.Headings.generic_building": "Other",
+    "Boxes.Productions.Headings.goods": "Goods",
     "Boxes.Productions.Headings.greatbuilding": "GBs",
     "Boxes.Productions.Headings.item": "Item",
     "Boxes.Productions.Headings.main_building": "Town Hall",
-    "Boxes.Productions.Headings.military": "Military Buildings",
+    "Boxes.Productions.Headings.military": "Military",
     "Boxes.Productions.Headings.name": "Item",
     "Boxes.Productions.Headings.number": "Qty",
-    "Boxes.Productions.Headings.off_grid": "Special buildings",
-    "Boxes.Productions.Headings.production": "Production Buildings",
-    "Boxes.Productions.Headings.random_production": "Random Productions",
-    "Boxes.Productions.Headings.residential": "Residential Buildings",
+    "Boxes.Productions.Headings.off_grid": "Special",
+    "Boxes.Productions.Headings.production": "Production",
+    "Boxes.Productions.Headings.random_production": "Random",
+    "Boxes.Productions.Headings.residential": "Residential",
     "Boxes.Productions.Headings.size": "Size",
     "Boxes.Productions.Headings.street": "Streets",
     "Boxes.Productions.Headings.tower": "Towers",
@@ -1100,6 +1100,7 @@
     "Boxes.Tooltip.Building.noPlunder":"can not be plundered",
     "Boxes.Tooltip.Building.lifeSupport":"is affected by life support",
     "Boxes.Tooltip.Building.size+time":"Size and Building Time",
+    "Boxes.Tooltip.Building.isUnique":"Unique Building",
     "Boxes.Treasury.Action": "Message",
     "Boxes.Treasury.Amount": "Amount",
     "Boxes.Treasury.DateTime": "Date/Time",