diff options
author | kytwb <412895+kytwb@users.noreply.github.com> | 2021-07-23 10:04:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 11:04:43 +0200 |
commit | 012e55ebf87559f2d782e5400fb885df8b80a445 (patch) | |
tree | 1966e58defe2bcd9541ca9a3f4db67a95a6b4249 /src/i18n/locales | |
parent | Removed references to 'premium' i18n keys that are no longer used. (diff) | |
download | ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.gz ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.zst ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.zip |
Fix hibernation mode (#1486)
* Use hibernation strategy from settings instead of hardcoded 5 minutes
* Fix conditions with isHibernationEnabled, previously disableHibernation
* Make service hibernation obey global setting
Also refactors hibernation to move some hibernation enablement logic
into the Service model
* Remove global hibernation enable switch
Implements option 4 from
https://github.com/getferdi/ferdi/pull/1486#issuecomment-860290992
according to
https://github.com/getferdi/ferdi/pull/1486#issuecomment-876558694
* Implements #865 : Add 'hibernate service' and 'wake up service' in the sidebar context menu.
* Removed 'hibernationEnabled' check on main settings screen
Since this is an (imo) incongruous behavior for the first time user.
They will see a message, but with no ability to choose the hibernation strategy.
* Autogenerated files from conflict fixes
Co-authored-by: Kristóf Marussy <kristof@marussy.com>
Co-authored-by: Vijay A <avijayr@protonmail.com>
Diffstat (limited to 'src/i18n/locales')
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 34 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 2 |
2 files changed, 32 insertions, 4 deletions
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 0cedeb4cb..7d4a0fe06 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -1867,29 +1867,55 @@ | |||
1867 | } | 1867 | } |
1868 | }, | 1868 | }, |
1869 | { | 1869 | { |
1870 | "defaultMessage": "!!!Delete Service", | 1870 | "defaultMessage": "!!!Hibernate Service", |
1871 | "end": { | 1871 | "end": { |
1872 | "column": 3, | 1872 | "column": 3, |
1873 | "line": 55 | 1873 | "line": 55 |
1874 | }, | 1874 | }, |
1875 | "file": "src/components/services/tabs/TabItem.js", | 1875 | "file": "src/components/services/tabs/TabItem.js", |
1876 | "id": "tabs.item.hibernateService", | ||
1877 | "start": { | ||
1878 | "column": 20, | ||
1879 | "line": 52 | ||
1880 | } | ||
1881 | }, | ||
1882 | { | ||
1883 | "defaultMessage": "!!!Wake Up Service", | ||
1884 | "end": { | ||
1885 | "column": 3, | ||
1886 | "line": 59 | ||
1887 | }, | ||
1888 | "file": "src/components/services/tabs/TabItem.js", | ||
1889 | "id": "tabs.item.wakeUpService", | ||
1890 | "start": { | ||
1891 | "column": 17, | ||
1892 | "line": 56 | ||
1893 | } | ||
1894 | }, | ||
1895 | { | ||
1896 | "defaultMessage": "!!!Delete Service", | ||
1897 | "end": { | ||
1898 | "column": 3, | ||
1899 | "line": 63 | ||
1900 | }, | ||
1901 | "file": "src/components/services/tabs/TabItem.js", | ||
1876 | "id": "tabs.item.deleteService", | 1902 | "id": "tabs.item.deleteService", |
1877 | "start": { | 1903 | "start": { |
1878 | "column": 17, | 1904 | "column": 17, |
1879 | "line": 52 | 1905 | "line": 60 |
1880 | } | 1906 | } |
1881 | }, | 1907 | }, |
1882 | { | 1908 | { |
1883 | "defaultMessage": "!!!Do you really want to delete the {serviceName} service?", | 1909 | "defaultMessage": "!!!Do you really want to delete the {serviceName} service?", |
1884 | "end": { | 1910 | "end": { |
1885 | "column": 3, | 1911 | "column": 3, |
1886 | "line": 59 | 1912 | "line": 67 |
1887 | }, | 1913 | }, |
1888 | "file": "src/components/services/tabs/TabItem.js", | 1914 | "file": "src/components/services/tabs/TabItem.js", |
1889 | "id": "tabs.item.confirmDeleteService", | 1915 | "id": "tabs.item.confirmDeleteService", |
1890 | "start": { | 1916 | "start": { |
1891 | "column": 24, | 1917 | "column": 24, |
1892 | "line": 56 | 1918 | "line": 64 |
1893 | } | 1919 | } |
1894 | } | 1920 | } |
1895 | ], | 1921 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 5ff146ea5..76fc7cfc2 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -453,7 +453,9 @@ | |||
453 | "tabs.item.enableAudio": "Enable audio", | 453 | "tabs.item.enableAudio": "Enable audio", |
454 | "tabs.item.enableNotification": "Enable notifications", | 454 | "tabs.item.enableNotification": "Enable notifications", |
455 | "tabs.item.enableService": "Enable service", | 455 | "tabs.item.enableService": "Enable service", |
456 | "tabs.item.hibernateService": "Hibernate service", | ||
456 | "tabs.item.reload": "Reload", | 457 | "tabs.item.reload": "Reload", |
458 | "tabs.item.wakeUpService": "Wake up service", | ||
457 | "validation.email": "{field} is not valid", | 459 | "validation.email": "{field} is not valid", |
458 | "validation.minLength": "{field} should be at least {length} characters long", | 460 | "validation.minLength": "{field} should be at least {length} characters long", |
459 | "validation.oneRequired": "At least one is required", | 461 | "validation.oneRequired": "At least one is required", |