Compare commits
3 Commits
c01f40102b
...
c60cc43e4c
Author | SHA1 | Date |
---|---|---|
Tero Paloheimo | c60cc43e4c | |
Сергій | 766e9a9795 | |
Tero Paloheimo | d1eadd380d |
|
@ -6,17 +6,17 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: \n"
|
"Project-Id-Version: \n"
|
||||||
"POT-Creation-Date: \n"
|
"POT-Creation-Date: \n"
|
||||||
"PO-Revision-Date: 2021-08-18 00:37+0000\n"
|
"PO-Revision-Date: 2024-02-15 13:01+0000\n"
|
||||||
"Last-Translator: Tymofii Lytvynenko <till.svit@gmail.com>\n"
|
"Last-Translator: Сергій <sergiy.goncharuk.1@gmail.com>\n"
|
||||||
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/safe-eyes/"
|
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/safe-eyes/"
|
||||||
"translations/uk/>\n"
|
"translations/uk/>\n"
|
||||||
"Language: uk\n"
|
"Language: uk\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
|
||||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||||
"X-Generator: Weblate 4.8-dev\n"
|
"X-Generator: Weblate 5.4-dev\n"
|
||||||
|
|
||||||
# Short break
|
# Short break
|
||||||
msgid "Tightly close your eyes"
|
msgid "Tightly close your eyes"
|
||||||
|
@ -48,7 +48,7 @@ msgstr "Випийте води"
|
||||||
|
|
||||||
# Long break
|
# Long break
|
||||||
msgid "Walk for a while"
|
msgid "Walk for a while"
|
||||||
msgstr "Трохи походіть"
|
msgstr "Прогуляйтесь"
|
||||||
|
|
||||||
# Long break
|
# Long break
|
||||||
msgid "Lean back at your seat and relax"
|
msgid "Lean back at your seat and relax"
|
||||||
|
@ -289,7 +289,7 @@ msgstr "Нова перерва"
|
||||||
|
|
||||||
# Settings dialog
|
# Settings dialog
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Видалити"
|
msgstr "Вилучити"
|
||||||
|
|
||||||
# Settings dialog
|
# Settings dialog
|
||||||
msgid "Discard"
|
msgid "Discard"
|
||||||
|
|
|
@ -22,9 +22,10 @@ This module contains the entity classes used by Safe Eyes and its plugins.
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import random
|
import random
|
||||||
from distutils.version import LooseVersion
|
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
|
from packaging.version import parse
|
||||||
|
|
||||||
from safeeyes import utility
|
from safeeyes import utility
|
||||||
|
|
||||||
|
|
||||||
|
@ -323,7 +324,7 @@ class Config:
|
||||||
else:
|
else:
|
||||||
user_config_version = str(
|
user_config_version = str(
|
||||||
meta_obj.get('config_version', '0.0.0'))
|
meta_obj.get('config_version', '0.0.0'))
|
||||||
if LooseVersion(user_config_version) != LooseVersion(system_config_version):
|
if parse(user_config_version) != parse(system_config_version):
|
||||||
# Update the user config
|
# Update the user config
|
||||||
self.__merge_dictionary(
|
self.__merge_dictionary(
|
||||||
self.__user_config, self.__system_config)
|
self.__user_config, self.__system_config)
|
||||||
|
|
|
@ -32,7 +32,6 @@ import sys
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import threading
|
import threading
|
||||||
from distutils.version import LooseVersion
|
|
||||||
from logging.handlers import RotatingFileHandler
|
from logging.handlers import RotatingFileHandler
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
@ -43,6 +42,7 @@ gi.require_version('Gtk', '3.0')
|
||||||
from gi.repository import Gtk
|
from gi.repository import Gtk
|
||||||
from gi.repository import GLib
|
from gi.repository import GLib
|
||||||
from gi.repository import GdkPixbuf
|
from gi.repository import GdkPixbuf
|
||||||
|
from packaging.version import parse
|
||||||
|
|
||||||
gi.require_version('Gdk', '3.0')
|
gi.require_version('Gdk', '3.0')
|
||||||
|
|
||||||
|
@ -559,7 +559,7 @@ def __update_plugin_config(plugin, plugin_config, config):
|
||||||
if plugin_config is None:
|
if plugin_config is None:
|
||||||
config['plugins'].remove(plugin)
|
config['plugins'].remove(plugin)
|
||||||
else:
|
else:
|
||||||
if LooseVersion(plugin.get('version', '0.0.0')) != LooseVersion(plugin_config['meta']['version']):
|
if parse(plugin.get('version', '0.0.0')) != parse(plugin_config['meta']['version']):
|
||||||
# Update the configuration
|
# Update the configuration
|
||||||
plugin['version'] = plugin_config['meta']['version']
|
plugin['version'] = plugin_config['meta']['version']
|
||||||
setting_ids = []
|
setting_ids = []
|
||||||
|
|
Loading…
Reference in New Issue