Summary: | the dateformat variable is not standardized in template files | ||
---|---|---|---|
Product: | Koha | Reporter: | Jonathan Druart <jonathan.druart> |
Component: | Templates | Assignee: | Jonathan Druart <jonathan.druart> |
Status: | CLOSED FIXED | QA Contact: | Paul Poulain <paul.poulain> |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | gmcharlt, kyle, paul.poulain |
Version: | 3.14 | ||
Hardware: | All | ||
OS: | All | ||
GIT URL: | Change sponsored?: | --- | |
Patch complexity: | Small patch | Documentation contact: | |
Documentation submission: | Text to go in the release notes: | ||
Version(s) released in: | Circulation function: | ||
Bug Depends on: | 9108 | ||
Bug Blocks: | |||
Attachments: |
Bug 9508: Standardize the dateformat value from C4::Auth
Bug 9508: Standardize the dateformat value from C4::Auth Bug 9508: Standardize the dateformat value from C4::Auth [PASSED QA] Bug 9508: Standardize the dateformat value from C4::Auth Bug 9508 follow-up : replacing tabs by spaces Bug 9508: Standardize the dateformat value from C4::Auth Bug 9508 follow-up : replacing tabs by spaces |
Description
Jonathan Druart
2013-01-30 15:14:05 UTC
Created attachment 14954 [details] [review] Bug 9508: Standardize the dateformat value from C4::Auth - the dateformat value is send to all templates (from C4::Auth::get_template_and_user) - remove all assignment of dateformat in all .pl files - Remove "all" occurrences (those I found!) of dateformat_* From now the only way to get the date format is a string comparaison (dateformat == "metric") Checked with the command: git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso\)" | grep -v translator Checked with git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso|\dateformatmetric|\dateformatus|\dateformatiso\)" | grep -v translator Created attachment 15009 [details] [review] Bug 9508: Standardize the dateformat value from C4::Auth - the dateformat value is send to all templates (from C4::Auth::get_template_and_user) - remove all assignment of dateformat in all .pl files - Remove "all" occurrences (those I found!) of dateformat_* From now the only way to get the date format is a string comparaison (dateformat == "metric") Checked with the command: git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso\)" | grep -v translator Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Tested all the datepickers I could find, looks good. sorry, but patch does not apply anymore due to other changes. I tried to fix the conflicts, but it's a little bit took risky imo. joubu, please (and switch back to signed-off) Created attachment 16600 [details] [review] Bug 9508: Standardize the dateformat value from C4::Auth - the dateformat value is send to all templates (from C4::Auth::get_template_and_user) - remove all assignment of dateformat in all .pl files - Remove "all" occurrences (those I found!) of dateformat_* From now the only way to get the date format is a string comparaison (dateformat == "metric") Checked with the command: git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso\)" | grep -v translator Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Tested all the datepickers I could find, looks good. QA comment * small patch, with nasty possible side effect, but looking at it it is properly written, clean code, so no reason to refuse him * passes koha-qa.pl, except for a tab. I've provided a follow-up with all tabs replaced by spaces (including tabs existing before the patch) * tested & could not find anything wrong passed QA Created attachment 16815 [details] [review] [PASSED QA] Bug 9508: Standardize the dateformat value from C4::Auth - the dateformat value is send to all templates (from C4::Auth::get_template_and_user) - remove all assignment of dateformat in all .pl files - Remove "all" occurrences (those I found!) of dateformat_* From now the only way to get the date format is a string comparaison (dateformat == "metric") Checked with the command: git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso\)" | grep -v translator Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Tested all the datepickers I could find, looks good. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Created attachment 16816 [details] [review] Bug 9508 follow-up : replacing tabs by spaces This patch fixes tabs and replace them by spaces This patch no longer applies. Bumping back for 3.14. No conflict here, switch back to "Passed QA". I too am getting merge conflicts applying this to master: git bz apply 9508 Bug 9508 - the dateformat variable is not standardized in template files [PASSED QA] Bug 9508: Standardize the dateformat value from C4::Auth Apply? [yn] y Applying: Bug 9508: Standardize the dateformat value from C4::Auth Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Auth.pm Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt Auto-merging members/memberentry.pl Failed to merge in the changes. Patch failed at 0001 Bug 9508: Standardize the dateformat value from C4::Auth When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Created attachment 17915 [details] [review] Bug 9508: Standardize the dateformat value from C4::Auth - the dateformat value is send to all templates (from C4::Auth::get_template_and_user) - remove all assignment of dateformat in all .pl files - Remove "all" occurrences (those I found!) of dateformat_* From now the only way to get the date format is a string comparaison (dateformat == "metric") Checked with the command: git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso\)" | grep -v translator Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Tested all the datepickers I could find, looks good. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Created attachment 17916 [details] [review] Bug 9508 follow-up : replacing tabs by spaces This patch fixes tabs and replace them by spaces Pushed to master. Thanks, Paul and Jonathan! |