Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved nice_relative_time to lingua-franca for internationalization (PR still to be approved there) #118

Open
wants to merge 2 commits into
base: 21.02
Choose a base branch
from
+2 −3
Open

Moved nice_relative_time to lingua-franca for internationalization (PR still to be approved there) #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1fb22
Moved nice_relative_time to lingua-franca for internationalization
e-gor Jul 25, 2021
8cd5bcb
Merge branch 'MycroftAI:21.02' into alarm.i18n
e-gor Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from mycroft.messagebus.message import Message
from mycroft.skills import skill_api_method
from mycroft.util import play_mp3
from mycroft.util.format import nice_date_time, nice_time, nice_date, join_list
from mycroft.util.format import nice_date_time, nice_time, nice_date, join_list, nice_relative_time
from mycroft.util.parse import extract_datetime, extract_number
from mycroft.util.time import to_utc, now_local, now_utc

Expand All @@ -38,7 +38,6 @@
get_next_repeat,
has_expired_alarm,
)
from .lib.format import nice_relative_time
from .lib.parse import fuzzy_match, utterance_has_midnight
from .lib.recur import (
create_day_set,
Expand Down
2 changes: 1 addition & 1 deletion lib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
get_next_repeat,
has_expired_alarm,
)
from .format import nice_relative_time
from mycroft.util.format import nice_relative_time
from .parse import fuzzy_match, utterance_has_midnight
from .recur import create_day_set, create_recurring_rule, describe_recurrence