diff --git a/README.md b/README.md index bfd88b3..53d323d 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ Then open the app. If you ever want to switch back to the production version, ty - ~There's an issue that the `BuildRequires: python3-pip;` line in the spec file throws an error. A workaround for now is to build these two awesome projects for the same target as for this project - [harbour-moremahjong](https://github.com/poetaster/harbour-moremahjong) and [sailfish-rpn-calculator](https://github.com/poetaster/sailfish-rpn-calculator).~ - ~A fix could be to use `python3 -m ensurepip --default-pip` instead of `BuildRequires: python3-pip;` in the spec, but it might break the build vm/container so I am not recommending it. You can still do so by uncommenting a line in the spec file.~ - The fix has been found, and it turns out very simple. Open the project in Sailfish IDE, right click on it in the file structure and click rebuild. +- You might need to `cd` into the build folder, run `sfdk config target=` and then `sfdk build-shell --maintain`, finally inside that shell run `python3 -m pip install --upgrade pip`. ## Credits diff --git a/SailDiscord/qml/pages/SettingsPage.qml b/SailDiscord/qml/pages/SettingsPage.qml index 423e152..e825bd9 100644 --- a/SailDiscord/qml/pages/SettingsPage.qml +++ b/SailDiscord/qml/pages/SettingsPage.qml @@ -228,7 +228,6 @@ Page { text: qsTr("Reset all settings") onClicked: { appSettings.clear() - //Notices.show(qsTr("Settings reset. Please restart the app"), Notice.Short, Notice.Center) pageStack.push(settingsResetPage) } } diff --git a/SailDiscord/rpm/SailDiscord.spec b/SailDiscord/rpm/SailDiscord.spec index 8df48e4..9a43d8a 100644 --- a/SailDiscord/rpm/SailDiscord.spec +++ b/SailDiscord/rpm/SailDiscord.spec @@ -63,6 +63,7 @@ Short description of my Sailfish OS Application #zypper install git %if %{package_library} == "yes" +#python3 -m pip install --upgrade pip #python3 -m pip cache purge python3 -m pip install "discord.py-self>=2.0" "requests" "Pillow" --target=%_builddir/deps #rm -rf %_builddir/deps/google/_upb diff --git a/SailDiscord/translations/harbour-saildiscord-it.ts b/SailDiscord/translations/harbour-saildiscord-it.ts index bffbd0a..9f951d6 100644 --- a/SailDiscord/translations/harbour-saildiscord-it.ts +++ b/SailDiscord/translations/harbour-saildiscord-it.ts @@ -446,60 +446,60 @@ Reset all settings - + Ripristina impostazioni - + Settings reset - + Ripristinando le impostazioni - + Please restart the app - + Per favore riavvia l'applicazione - + Never Mai - + On app restart Al riavvio dell'applicazione - + Changes how often the cache is updated. App restart might be required Cambia il numero di volte che la cache viene aggiornata. Un riavvio potrebbe essere necessario - + Hourly Ogni ora - + Daily Giornalmente - + Weekly Settimanalmente - + Monthly Mensilmente - + Half-yearly Semestrale - + Yearly Annualmente diff --git a/SailDiscord/translations/harbour-saildiscord-ru.ts b/SailDiscord/translations/harbour-saildiscord-ru.ts index da69ded..5557290 100644 --- a/SailDiscord/translations/harbour-saildiscord-ru.ts +++ b/SailDiscord/translations/harbour-saildiscord-ru.ts @@ -444,60 +444,60 @@ Reset all settings - + Сбросить все настройки - + Settings reset - + Настройки сброшены - + Please restart the app - + Пожалуйста, перезапустите приложение - + Never Никогда - + On app restart При перезагрузке приложения - + Changes how often the cache is updated. App restart might be required Изменяет, как часто происходит обновление кэша. Может потребоваться перезагрузка приложения - + Hourly Каждый час - + Daily Ежедневно - + Weekly Еженедельно - + Monthly Ежемесячно - + Half-yearly Каждые полгода - + Yearly Ежегодно diff --git a/SailDiscord/translations/harbour-saildiscord.ts b/SailDiscord/translations/harbour-saildiscord.ts index 96c2d3b..6c50a48 100644 --- a/SailDiscord/translations/harbour-saildiscord.ts +++ b/SailDiscord/translations/harbour-saildiscord.ts @@ -447,57 +447,57 @@ - + Settings reset - + Please restart the app - + Never - + On app restart - + Changes how often the cache is updated. App restart might be required - + Hourly - + Daily - + Weekly - + Monthly - + Half-yearly - + Yearly