yawn: new words localized

[etc/awesome.git] / widgets / bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 485fd572aa61c3e2a3cb632f8c2eb781ce5c01e4..2ace758d7a786b5183a60f7d4f8fc2c58e4a8b62 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -122,20 +122,22 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
         settings()
 
         -- notifications for low and critical states

-        bat_now.perc = tonumber(bat_now.perc)

         if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
         then
         if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
         then

-            if bat_now.perc <= 5
+            local nperc = tonumber(bat_now.perc) or 100
+            if nperc <= 5

             then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,

-                    replaces_id = bat.id
+                    replaces_id = bat.id,
+                    screen = client.focus and client.focus.screen or 1

                 }).id
                 }).id

-            elseif bat_now.perc <= 15
+            elseif nperc <= 15

             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,

-                    replaces_id = bat.id
+                    replaces_id = bat.id,
+                    screen = client.focus and client.focus.screen or 1

                 }).id
             end
         end
                 }).id
             end
         end