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.

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

Fix exception during tag removal #935

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 GTG/gtk/browser/adaptive_button.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def do_forall(self, include_internals: bool, callback, *args):
except Exception as e:
log.warning("Silenced exception: %r", e)
except AttributeError as e: # ... object has no attribute '_children'
log.warning("Got error in for but it should've stay valid: %r", e)
log.warning("Got error in for but it should have stayed valid: %r", e)

def do_child_type(self):
log.debug("returning %r", Gtk.Widget.__gtype__)
Expand All @@ -293,4 +293,3 @@ def do_set_child_property(self, child: Gtk.Widget, property_id: int,
# We don't have any child properties anyway
log.debug("Unimplemented child=%r, property_id=%r, value=%r, pspec=%r",
child, property_id, value, pspec)

2 changes: 1 addition & 1 deletion GTG/gtk/browser/modify_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def on_confirm(self, widget):
if is_positive:
t.add_tag(_tag)
else:
t.remove_tag(_tag)
t.remove_tag(_tag.name)

self.app.ds.save()

Expand Down
2 changes: 1 addition & 1 deletion docs/contributors/translating.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Because of that, you may need to update the translation files manually.
# Updating the translation files

1. Follow the [readme][readme] to pull GTG and install the dependencies, especially meson and gettext.
2. Run `./launch.sh` in the repository root at least once. The folder `.local_build` should've been generated and GTG should run. Exit GTG.
2. Run `./launch.sh` in the repository root at least once. The folder `.local_build` should have been generated and GTG should run. Exit GTG.
3. Run `ninja -C .local_build gtg-pot gtg-update-po` to update the translation files.

[readme]: ../../README.md
Expand Down
2 changes: 1 addition & 1 deletion tests/backend/backend_caldav_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def get_todo(uid):
('CHILD-PARENT', ['ROOT'], ['GRAND-CHILD'])):
task = datastore.get_task(uid)
self.assertEqual(children, CHILDREN_FIELD.get_dav(get_todo(uid)),
"children should've been written by sync down")
"children should have been written by sync down")
self.assertEqual(children, task.get_children(),
"children missing from task")
self.assertEqual(parents, PARENT_FIELD.get_dav(get_todo(uid)),
Expand Down