Merge lp:~quam-plures-core/quam-plures/alpha-dracones into lp:quam-plures

Proposed by Yabs
Status: Merged
Merged at revision: 7582
Proposed branch: lp:~quam-plures-core/quam-plures/alpha-dracones
Merge into: lp:quam-plures
Diff against target: 51 lines (+22/-3)
2 files modified
qp_templates/_contributors.php (+2/-2)
qp_templates/_credits.disp.php (+20/-1)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/alpha-dracones
Reviewer Review Type Date Requested Status
EdB Approve
Quam Plures Core Team Pending
Review via email: mp+45638@code.launchpad.net

Description of the change

Corrects error with Toppies flag, also added her spiel of choice
Better alpha sorting of dracones based on their displayed name

¥

To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

grabbing branch at this time...

Revision history for this message
EdB (edb) wrote :

looks good works great :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qp_templates/_contributors.php'
--- qp_templates/_contributors.php 2010-12-31 10:01:08 +0000
+++ qp_templates/_contributors.php 2011-01-09 15:11:19 +0000
@@ -66,8 +66,8 @@
66 'topanga' => array(66 'topanga' => array(
67 'name' => 'Topanga',67 'name' => 'Topanga',
68 'homepage' => 'http://www.tenderfeelings.be/',68 'homepage' => 'http://www.tenderfeelings.be/',
69 'locale' => 'be-NL',69 'locale' => 'be-BE',
70 'spiel' => T_( 'I have nothing to say!' )70 'spiel' => T_( 'if you can\'t do it the way it is suppose to be done, do it the way you can' )
71 ),71 ),
72 'yabs' => array(72 'yabs' => array(
73 'name' => 'Yabs',73 'name' => 'Yabs',
7474
=== modified file 'qp_templates/_credits.disp.php'
--- qp_templates/_credits.disp.php 2010-12-29 12:53:02 +0000
+++ qp_templates/_credits.disp.php 2011-01-09 15:11:19 +0000
@@ -99,7 +99,8 @@
99 echo '<dt>'.T_('Core Contributors').':</dt>'."\n";99 echo '<dt>'.T_('Core Contributors').':</dt>'."\n";
100 echo '<dd><dl>'."\n";100 echo '<dd><dl>'."\n";
101101
102 ksort( $_hic_sunt_dracones ); // alpha order102 usort( $_hic_sunt_dracones, 'alpha_dracones' );
103
103 foreach( $_hic_sunt_dracones as $dracone )104 foreach( $_hic_sunt_dracones as $dracone )
104 {105 {
105 echo '<dt><a href="'.$dracone['homepage'].'" title="';106 echo '<dt><a href="'.$dracone['homepage'].'" title="';
@@ -128,3 +129,21 @@
128129
129</dl>130</dl>
130</div>131</div>
132<?php
133/**
134 * Callback function for sorting dracones into alphabetical order by "name"
135 * as opposed to forum names, which are the (unique) array keys we use
136 *
137 * @param string $drac_1 array entry
138 * @param string $drac_2 next array entry
139 * @return is $drac_1's name further down the alphabet than $drac_2's name
140 */
141function alpha_dracones( $drac_1, $drac_2 )
142{
143 $sorted = array( $drac_1['name'], $drac_2['name'] );
144 natcasesort( $sorted );
145 $sorted = array_values( $sorted );
146
147 return ( $sorted[0] == $drac_2['name'] );
148}
149?>
131\ No newline at end of file150\ No newline at end of file

Subscribers

People subscribed via source and target branches