From a94df6fa0d5f47e4f2e22d8be20ea4a97310ad37 Mon Sep 17 00:00:00 2001 From: "gitlocalize-app[bot]" <55277160+gitlocalize-app[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 18:22:11 +0000 Subject: [PATCH 1/7] Translate intents.json via GitLocalize (#66) Co-authored-by: timonvanhasselt --- translations/nl-nl/intents.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/nl-nl/intents.json b/translations/nl-nl/intents.json index f57572e..494b5d5 100644 --- a/translations/nl-nl/intents.json +++ b/translations/nl-nl/intents.json @@ -23,6 +23,6 @@ "wiki.intent": [ "(wiki|wikipedia) {query}", "wat zegt (wiki|wikipedia) over {query}", - "(zoek op|check (wiki|wikipedia) (naar|voor){query}" + "(zoek op|check) (wiki|wikipedia) (naar|voor){query}" ] } From 4ff0dd868164fabc343ad24d145ad3c1d2c7ea2c Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 12 Nov 2024 18:22:22 +0000 Subject: [PATCH 2/7] Update translations --- locale/da-dk/More.voc | 4 ++++ locale/da-dk/no entry found.dialog | 2 ++ locale/da-dk/query.intent | 11 +++++++++++ locale/da-dk/searching.dialog | 2 ++ locale/da-dk/thats all.dialog | 2 ++ locale/da-dk/wiki.intent | 3 +++ locale/da-dk/wikiroulette.dialog | 2 ++ locale/da-dk/wikiroulette.intent | 5 +++++ locale/nl-nl/wiki.intent | 2 +- 9 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 locale/da-dk/More.voc create mode 100644 locale/da-dk/no entry found.dialog create mode 100644 locale/da-dk/query.intent create mode 100644 locale/da-dk/searching.dialog create mode 100644 locale/da-dk/thats all.dialog create mode 100644 locale/da-dk/wiki.intent create mode 100644 locale/da-dk/wikiroulette.dialog create mode 100644 locale/da-dk/wikiroulette.intent diff --git a/locale/da-dk/More.voc b/locale/da-dk/More.voc new file mode 100644 index 0000000..76771e3 --- /dev/null +++ b/locale/da-dk/More.voc @@ -0,0 +1,4 @@ +fortsæt +fortæl mig mere +fortæll mere +vide mere \ No newline at end of file diff --git a/locale/da-dk/no entry found.dialog b/locale/da-dk/no entry found.dialog new file mode 100644 index 0000000..3b08e91 --- /dev/null +++ b/locale/da-dk/no entry found.dialog @@ -0,0 +1,2 @@ +Jeg er bange for, at der ikke er nogen artikel om det +Jeg kan ikke finde en relateret Wikipedia-artikel \ No newline at end of file diff --git a/locale/da-dk/query.intent b/locale/da-dk/query.intent new file mode 100644 index 0000000..4002380 --- /dev/null +++ b/locale/da-dk/query.intent @@ -0,0 +1,11 @@ +Giv mig oplysninger om {keyword} +Hvad ved du om {keyword} +Jeg er nysgerrig efter {keyword} +Jeg søger detaljer om {keyword} +Jeg vil gerne vide mere om {keyword} +Kan du forklare, hvad {keyword} er +Kan du give detaljer om {keyword} +Kan du oplyse mig om {keyword} +fortæl mig om {keyword} +hvad er {keyword} +hvem (er|var) {søgeord} \ No newline at end of file diff --git a/locale/da-dk/searching.dialog b/locale/da-dk/searching.dialog new file mode 100644 index 0000000..242dcce --- /dev/null +++ b/locale/da-dk/searching.dialog @@ -0,0 +1,2 @@ +Jeg tjekker Wikipedia for {query} +Lad mig slå {query} op i Wikipedia \ No newline at end of file diff --git a/locale/da-dk/thats all.dialog b/locale/da-dk/thats all.dialog new file mode 100644 index 0000000..f94f6cb --- /dev/null +++ b/locale/da-dk/thats all.dialog @@ -0,0 +1,2 @@ +Det er alt, hvad jeg kan finde +Det er alt, hvad jeg ved \ No newline at end of file diff --git a/locale/da-dk/wiki.intent b/locale/da-dk/wiki.intent new file mode 100644 index 0000000..7ae8d05 --- /dev/null +++ b/locale/da-dk/wiki.intent @@ -0,0 +1,3 @@ +(søg|tjek) (wiki|wikipedia) for {query} +(wiki|wikipedia) {query} +hvad siger (wiki|wikipedia) om {query} \ No newline at end of file diff --git a/locale/da-dk/wikiroulette.dialog b/locale/da-dk/wikiroulette.dialog new file mode 100644 index 0000000..4f0a2f1 --- /dev/null +++ b/locale/da-dk/wikiroulette.dialog @@ -0,0 +1,2 @@ +spiller wikipedia roulette +viden roulette aktiveret \ No newline at end of file diff --git a/locale/da-dk/wikiroulette.intent b/locale/da-dk/wikiroulette.intent new file mode 100644 index 0000000..2c87239 --- /dev/null +++ b/locale/da-dk/wikiroulette.intent @@ -0,0 +1,5 @@ +(spil|spil) (wiki|wikipedia) roulette +(vis|vis|åben) tilfældig (wiki|wikipedia) +(wiki|wikipedia) roulette +tilfældig (wiki|wikipedia) +tilfældig (wiki|wikipedia) side \ No newline at end of file diff --git a/locale/nl-nl/wiki.intent b/locale/nl-nl/wiki.intent index 604a15a..6f17172 100644 --- a/locale/nl-nl/wiki.intent +++ b/locale/nl-nl/wiki.intent @@ -1,3 +1,3 @@ (wiki|wikipedia) {query} -(zoek op|check (wiki|wikipedia) (naar|voor){query} +(zoek op|check) (wiki|wikipedia) (naar|voor){query} wat zegt (wiki|wikipedia) over {query} \ No newline at end of file From 2a166bba0b82fde777e93cdfefc0835f4d97fa7f Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 12 Nov 2024 18:22:37 +0000 Subject: [PATCH 3/7] Increment Version to 0.5.5a1 --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index ee50579..4fd60e0 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 5 -VERSION_BUILD = 4 -VERSION_ALPHA = 0 +VERSION_BUILD = 5 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 32a002e6ddb12c707a24f93e5320cce642aa1b12 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 12 Nov 2024 18:23:01 +0000 Subject: [PATCH 4/7] Update Changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7f695a..9847e29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [0.5.4a1](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/tree/0.5.4a1) (2024-11-02) +## [0.5.5a1](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/tree/0.5.5a1) (2024-11-12) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/compare/0.5.3...0.5.4a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/compare/0.5.4...0.5.5a1) **Merged pull requests:** -- da-dk/translate [\#64](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/pull/64) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) +- fixed error in 1 intent [\#66](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/pull/66) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app)) From 529f9807579820788569f0ac526547612acb1e12 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Fri, 15 Nov 2024 20:29:55 +0000 Subject: [PATCH 5/7] fix: skill.json (#68) --- MANIFEST.in | 5 +- __init__.py | 2 +- {ui => gui/all}/jumping.gif | Bin locale/en-us/skill.json | 23 ++++++ requirements.txt | 1 + .../skill-wikipedia-for-humans.desktop | 10 --- res/desktop/skill.json | 66 ------------------ 7 files changed, 26 insertions(+), 81 deletions(-) rename {ui => gui/all}/jumping.gif (100%) create mode 100644 locale/en-us/skill.json delete mode 100644 res/desktop/skill-wikipedia-for-humans.desktop delete mode 100644 res/desktop/skill.json diff --git a/MANIFEST.in b/MANIFEST.in index bb58308..b968593 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,3 @@ -recursive-include dialog * -recursive-include vocab * recursive-include locale * recursive-include res * -recursive-include ui * -recursive-include skill * \ No newline at end of file +recursive-include gui * \ No newline at end of file diff --git a/__init__.py b/__init__.py index 8e54fc7..f47e79c 100755 --- a/__init__.py +++ b/__init__.py @@ -193,7 +193,7 @@ def handle_search(self, message): "image": None, } - self.gui.show_animated_image(join(dirname(__file__), "ui", "jumping.gif")) + self.gui.show_animated_image("jumping.gif") self.speak_dialog("searching", {"query": query}) diff --git a/ui/jumping.gif b/gui/all/jumping.gif similarity index 100% rename from ui/jumping.gif rename to gui/all/jumping.gif diff --git a/locale/en-us/skill.json b/locale/en-us/skill.json new file mode 100644 index 0000000..a21673d --- /dev/null +++ b/locale/en-us/skill.json @@ -0,0 +1,23 @@ +{ + "skill_id": "skill-ovos-wikipedia.openvoiceos", + "source": "https://github.com/OpenVoiceOS/skill-ovos-wikipedia", + "name": "Wikipedia", + "description": "Query Wikipedia for answers to all your questions. Get just a summary, or ask for more to get in-depth information.", + "examples": [ + "Tell me about Elon Musk", + "Tell me about beans", + "Check Wikipedia for beans", + "Tell me about the Pembroke Welsh Corgi", + "Search for chocolate", + "More information", + "Tell me More" + ], + "tags": [ + "wikipedia", + "encyclopedia", + "general-knowledge", + "wiki", + "question", + "query" + ] +} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 6b9940f..147d43e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ ovos-utils>=0.0.38,<1.0.0 ovos_workshop>=0.0.15,<3.0.0 ovos-plugin-manager>=0.0.26,<1.0.0 +ovos-bus-client>=1.0.1 \ No newline at end of file diff --git a/res/desktop/skill-wikipedia-for-humans.desktop b/res/desktop/skill-wikipedia-for-humans.desktop deleted file mode 100644 index 53cec35..0000000 --- a/res/desktop/skill-wikipedia-for-humans.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Terminal=false -Type=Application -Name=DuckDuckGo Skill -Exec=mycroft-gui-app --hideTextInput --skill=skill-wikipedia-for-humans.jarbasskills.home -Icon=wikipedia.png -Categories=VoiceApp -StartupNotify=false -X-DBUS-StartupType=None -X-KDE-StartupNotify=false diff --git a/res/desktop/skill.json b/res/desktop/skill.json deleted file mode 100644 index 74a3983..0000000 --- a/res/desktop/skill.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "authorname": "OpenVoiceOS", - "foldername": "skill-ovos-wikipedia", - "url": "https://github.com/OpenVoiceOS/skill-ovos-wikipedia", - "branch": "dev", - "license": "apache-2.0", - "tags": [ - "encyclopedia", - "question", - "general-knowledge", - "query", - "wiki", - "wikipedia", - "Information", - "permissive-license" - ], - "short_description": "Wikipedia", - "last_updated": "2022-10-11T14:30:36Z", - "icon": "https://raw.githack.com/FortAwesome/Font-Awesome/master/svgs/brands/wikipedia-w.svg", - "skillname": "Wikipedia", - "description": "Query [Wikipedia](https://www.wikipedia.org) for answers to all your questions. Get just a summary, or ask for more to get in-depth information.\n \n This Skill uses the [Wikipedia for humans](https://github.com/OpenJarbas/wikipedia_for_humans) library. \n\n![](./gui.gif)", - "examples": [ - "tell me about {query}", - "wiki {query}", - "random wiki page", - "play the wiki roulette", - "what does wiki say about {query}", - "display random wikipedia", - "check wikipedia for {query}", - "show random wiki", - "play the wikipedia roulette", - "tell us about {query}", - "random wiki", - "wiki roulette", - "wikipedia roulette", - "play wikipedia roulette", - "random wikipedia page", - "play wiki roulette", - "display random wiki", - "check wiki for {query}", - "wikipedia {query}", - "search wiki for {query}", - "open random wikipedia", - "random wikipedia", - "what does wikipedia say about {query}", - "search wikipedia for {query}", - "show random wikipedia", - "open random wiki" - ], - "category": "Information", - "categories": [ - "Information" - ], - "logo": "https://raw.githubusercontent.com/OpenVoiceOS/skill-ovos-wikipedia/dev/logo.png", - "requirements": { - "python": [ - "neon_solver_wikipedia_plugin", - "neon-solvers", - "ovos_utils", - "wikipedia_for_humans>=0.2.3" - ], - "skill": [], - "system": {} - }, - "desktopFile": false -} \ No newline at end of file From dfa239de5b42a7659f151c065b9194744d701cc7 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Fri, 15 Nov 2024 20:30:13 +0000 Subject: [PATCH 6/7] Increment Version to 0.5.6a1 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 4fd60e0..d11e6b9 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 5 -VERSION_BUILD = 5 +VERSION_BUILD = 6 VERSION_ALPHA = 1 # END_VERSION_BLOCK From f5cea8403e2ce801e0ba97a93c62539e18a602e4 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Fri, 15 Nov 2024 20:30:42 +0000 Subject: [PATCH 7/7] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9847e29..c30f874 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.5.6a1](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/tree/0.5.6a1) (2024-11-15) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/compare/0.5.5a1...0.5.6a1) + +**Merged pull requests:** + +- fix: skill.json [\#68](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/pull/68) ([JarbasAl](https://github.com/JarbasAl)) + ## [0.5.5a1](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/tree/0.5.5a1) (2024-11-12) [Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-wikipedia/compare/0.5.4...0.5.5a1)