Merge lp:~quam-plures-core/quam-plures/dracones into lp:quam-plures
Status: | Merged |
---|---|
Merged at revision: | 7603 |
Proposed branch: | lp:~quam-plures-core/quam-plures/dracones |
Merge into: | lp:quam-plures |
Diff against target: |
102 lines (+12/-24) 3 files modified
qp_templates/_contributors.php (+5/-1) qp_templates/_credits.disp.php (+1/-19) qp_templates/basic/_credits.disp.php (+6/-4) |
To merge this branch: | bzr merge lp:~quam-plures-core/quam-plures/dracones |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Yabs (community) | Approve | ||
EdB | Approve | ||
Review via email: mp+65511@code.launchpad.net |
Description of the change
This branch mainly fixes an issue with the credits page that I've noticed. tilqi's last name is not displayed properly (wrong encoding). The solution is to convert it from UTF-8 (the contributor file's charset) to the internal QP charset. It will then automatically be converted to the right final encoding.
I also streamlined the way how we sort contributors alphabetically. Nothing mission critical, but less code is always good.
Finally, I noticed there's a separate credits disp handler for the basic template that slightly differs from the global credits disp -- it also missed some of the recent changes to the latter; I updated it.
Tested and seems to work. Installing the whole app also works for me.
Nice! I kept thinking there must be a way to make Tilqi's name show up correctly :)
FYI, the basic template has it's own credits page due to it is the only one of the canned templates that either has or doesn't have the page title handled by the other files. There are some others that way in the template branch thing so I'll take a look at them and tidy them up according to what was done here.
Will merge this when I merge in the branch who's name I forget right now instead of merging it now because I'm pretty sure we should always give others a chance to review and comment. Even on an easy win like this one.