Merge lp:~bialix/bzr/status-with-shelves into lp:bzr/2.3
Proposed by
Alexander Belchenko
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5615 |
Proposed branch: | lp:~bialix/bzr/status-with-shelves |
Merge into: | lp:bzr/2.3 |
Diff against target: |
41 lines (+18/-3) 2 files modified
bzrlib/status.py (+8/-2) bzrlib/tests/blackbox/test_status.py (+10/-1) |
To merge this branch: | bzr merge lp:~bialix/bzr/status-with-shelves |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Needs Fixing | ||
Review via email: mp+48023@code.launchpad.net |
Commit message
Use proper plural form to print status message about existing shelves.
Description of the change
I like new status messages about existing shelves in the working tree. This patch tries to improve singular/plural support for English message. Bazaar don't have i18n support yet, so I don't try to implement the full support for every possible language. Actually this case is perfectly handled by Python gettext library.
To post a comment you must log in.
I will be happy to see it merged into bzr 2.3.1