Merge lp://staging/~camptocamp/ocb-addons/7.0-fix-1188593 into lp://staging/ocb-addons
Proposed by
Nicolas Bessi - Camptocamp
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 9296 | ||||
| Proposed branch: | lp://staging/~camptocamp/ocb-addons/7.0-fix-1188593 | ||||
| Merge into: | lp://staging/ocb-addons | ||||
| Diff against target: |
34 lines (+12/-3) 1 file modified
hr_timesheet_sheet/hr_timesheet_sheet.py (+12/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~camptocamp/ocb-addons/7.0-fix-1188593 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Holger Brunn (Therp) | Approve | ||
| Stefan Rijnhart (Opener) | Approve | ||
| Alexandre Fayolle - camptocamp | code review, no test | Approve | |
|
Review via email:
|
|||
Description of the change
fix bug 1188593
timesheet sheet name_search now support monthly and daily timesheet range
To post a comment you must log in.
Revision history for this message
| Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote | # |
Revision history for this message
| Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote | # |
review:
Approve
(code review, no test)
Revision history for this message
| Holger Brunn (Therp) (hbrunn) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
#11, #14 Put the strings themselves into _() and remove it from #26, this way they are properly extracted.
What I'd prefer: Put the whole string into a translated format string, like _('Week %U') and feed that to strftime (label can be dropped then). We shouldn't make assumptions on how other languages handle that.