bump version to 24, add gnome 3.34, fix #56 #57

README.md

@@ -21,7 +21,7 @@ This is my first attempt at a GNOME extension, so it may have some issues.
 * Optionally clean up Wallpaper directory after between 1 and 7 days (delete oldest first), or keep them forever
 * Only attempts to download wallpapers when they have been updated
 * Doesn't poll continuously - only once per day and on startup (a refresh is scheduled when Bing is due to update)
-* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN), French (fr_FR), Portugeuse (pt, pt_BR), Russian (ru_RU), Spanish (es), Korean (ko, ko_KR, ko_KP), Indonesian (id) and Catalan (ca) - a HUGE thanks to the translators
+* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN), French (fr_FR), Portugeuse (pt, pt_BR), Russian (ru_RU), Spanish (es), Korean (ko, ko_KR, ko_KP), Indonesian (id), Catalan (ca) and Norwegian Bokmål & Nynorsk - a HUGE thanks to the translators
 
 ## TODO
 

buildzip.sh

@@ -14,4 +14,4 @@ rm [email protected]
 
 zip -r [email protected] *
 
-zip -d [email protected] screenshot/* screenshot buildzip.sh Settings.ui.h
+zip -d [email protected] screenshot/* screenshot buildzip.sh Settings.ui.h npm-debug.log

extension.js

@@ -171,16 +171,14 @@ const BingWallpaperIndicator = new Lang.Class({
     },
 
     _setBackground: function() {
-        let changed = false;
         if (this.filename == "")
             return;
-        if (this._settings.get_boolean('set-background')) {
-            changed = doSetBackground(this.filename, 'org.gnome.desktop.background');
-        }
-        if (this._settings.get_boolean('set-lock-screen')) {
-            changed = changed || doSetBackground(this.filename, 'org.gnome.desktop.screensaver');
-        }
-        return changed;
+
+        if (this._settings.get_boolean('set-background'))
+            doSetBackground(this.filename, 'org.gnome.desktop.background');
+
+        if (this._settings.get_boolean('set-lock-screen'))
+            doSetBackground(this.filename, 'org.gnome.desktop.screensaver');
     },
 
     _copyURLToClipboard: function() {
@@ -281,22 +279,17 @@ const BingWallpaperIndicator = new Lang.Class({
 
         log('JSON returned (raw):\n' + data);
 
-        if (datamarket != prefmarket) {
-          log('Mismatched market data, Req: '+prefmarket +' != Recv: ' + datamarket +')');
-          this.title = _("Market not available in your region");
-          this.copyright = 'Request: '+prefmarket +' Recv: ' + datamarket;
-          this.imageinfolink = '';
-          this._setMenuText();
-          this._updatePending = false;
-          return;
-        }
-
         if (imagejson['url'] != '') {
             this.title = imagejson['copyright'].replace(/\s*\(.*?\)\s*/g, "");
             this.explanation = _("Bing Wallpaper of the Day for")+' '+this._localeDate(imagejson['startdate'])+' ('+datamarket+')';
-            this.copyright = imagejson['copyright'].match(/\(([^)]+)\)/)[1].replace('\*\*','');;
+            this.copyright = imagejson['copyright'].match(/\(([^)]+)\)/)[1].replace('\*\*','');
+            if (datamarket != prefmarket) {
+                // user requested a market that isn't available in their GeoIP area, so they are forced to use another generic type (probably "en-WW")
+                log('Mismatched market data, Req: '+prefmarket +' != Recv: ' + datamarket +')');
+                this.copyright = this.copyright + '\n\n WARNING: ' + _("Market not available in your region") + '\n Req: '+prefmarket +' -> Recv: ' + datamarket;
+            }
             this.longstartdate = imagejson['fullstartdate'];
-            this.imageinfolink = imagejson['copyrightlink'].replace(/^http:\/\//i, 'https://');;
+            this.imageinfolink = imagejson['copyrightlink'].replace(/^http:\/\//i, 'https://');
             let resolution = this._settings.get_string('resolution');
 
             if (resolution == "auto") {

locale/BingWallpaper.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-23 15:05+1000\n"
+"POT-Creation-Date: 2019-07-23 15:25+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

locale/de/LC_MESSAGES/BingWallpaper.po

@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-07-23 15:05+1000\n"
-"PO-Revision-Date: 2019-07-23 15:07+1000\n"
+"PO-Revision-Date: 2019-07-25 08:48+0200\n"
 "Last-Translator: Onno Giesmann <[email protected]>\n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 
 #: Settings.ui.h:1
 msgid "Hide the indicator"
 msgstr "Indikator ausblenden"
 
 #: Settings.ui.h:2
 msgid "Set background image"
-msgstr "Hintergrundbild einstellen"
+msgstr "Verwenden für Schreibtisch"
 
 #: Settings.ui.h:3
 msgid "Set lock screen image"
-msgstr "Hintergrundbild des Sperrbildschirms einstellen"
+msgstr "Verwenden für Sperrbildschirm"
 
 #: Settings.ui.h:4
 msgid "Download folder:"
@@ -74,8 +74,8 @@ msgid ""
 "Changes your wallpaper daily to the Bing picture of the day for your region. "
 "Displays the picture description and copyright information."
 msgstr ""
-"Wechselt täglich Ihr Hintergrundbild zum aktuellen Bild des Tages von Bing "
-"für Ihre Region. Zeigt eine Benachrichtigung mit Bildbeschreibung und "
+"Wechselt täglich Ihr Hintergrundbild zum aktuellen Bing Bild des Tages für "
+"Ihre Region. Zeigt eine Benachrichtigung mit Bildbeschreibung und "
 "Urheberrechtsinformation an."
 
 #: Settings.ui.h:15
@@ -143,7 +143,7 @@ msgstr "Nächste Aktualisierung"
 
 #: extension.js:286 prefs.js:152
 msgid "Market not available in your region"
-msgstr "Bing-Bild in Ihrer Region nicht verfügbar"
+msgstr "Bing Bild in Ihrer Region nicht verfügbar"
 
 #: extension.js:296
 msgid "Bing Wallpaper of the Day for"
@@ -159,7 +159,7 @@ msgstr "Heute kein Bild 😞."
 
 #: prefs.js:140
 msgid "Fetching data..."
-msgstr "Daten abrufen..."
+msgstr "Daten werden abgerufen..."
 
 #: prefs.js:156
 msgid "A network error occured"

metadata.json

@@ -1,9 +1,9 @@
 {
     "uuid": "[email protected]",
-    "shell-version": ["3.18", "3.20", "3.22", "3.24", "3.24.2", "3.26", "3.28", "3.30", "3.32"],
+    "shell-version": ["3.18", "3.20", "3.22", "3.24", "3.24.2", "3.26", "3.28", "3.30", "3.32", "3.34"],
     "name": "Bing Wallpaper Changer",
     "settings-schema": "org.gnome.shell.extensions.bingwallpaper",
     "description": "Lightweight GNOME shell extension to change your wallpaper every day to Microsoft Bing's wallpaper (the image you see when you visit Bing.com). It will also show a notification containing the title and the explanation of the image.\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nThis extension is based extensively on the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nFeatures:\n* Fetches the Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (these are both user selectable)\n* Optionally force a specific region (i.e. locale)\n* Automatically selects the highest resolution (and most appropriate wallpaper) in multiple monitor setups\n* Optionally clean up Wallpaper directory after between 1 and 7 days (delete oldest first)\n* Only attempts to download wallpapers when they have been updated\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n* German, Dutch, Italian, Polish and Chinese translations\n\nPlease report bugs to the GitHub page below",
-    "version": "23",
+    "version": "24",
     "url": "https://github.com/neffo/bing-wallpaper-gnome-extension"
 }