Commit d73ae1e1 authored by Jerome Flesch's avatar Jerome Flesch

Merge branch 'testing' into develop

# Conflicts:
#	activate_test_env.sh
Signed-off-by: Jerome Flesch's avatarJerome Flesch <jflesch@openpaper.work>
parents 29d2a355 adfe4751
Pipeline #105415 canceled with stage
in 3 minutes and 7 seconds
......@@ -3,9 +3,10 @@ if ! [ -e sub/libinsane/Makefile ] ; then
git submodule update --recursive --remote --init
fi
make venv
source venv/bin/activate
cd sub/libinsane && source ./activate_test_env.sh ; cd ../..
make -C sub/pyocr install_py
make venv && \
source venv/bin/activate && \
cd sub/libinsane && \
source ./activate_test_env.sh && \
cd ../.. && \
make -C sub/pyocr install_py && \
make -C sub/libpillowfight install_py
......@@ -1414,7 +1414,11 @@ class DocPropertiesPanel(object):
date = BasicDoc.parse_name(date_txt)
except ValueError:
logger.warning("Invalid date format: {}".format(date_txt))
msg = _("Invalid date format: {}").format(date_txt)
msg = _("Invalid date format: {}\nExpected format: {}").format(
date_txt,
# TODO(Jflesch): Ugly. Example should come from the backend.
datetime.datetime(2019, 8, 17, 12, 0, 0, 0).strftime("%x")
)
dialog = Gtk.MessageDialog(
parent=self.__main_win.window,
flags=Gtk.DialogFlags.MODAL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment