MemberDB

Merge lp:~cafuego/memberdb/fixdatefmt into lp:memberdb

  1. fixdatefmt
  2. Merge into trunk
Proposed by Cafuego
Status: Needs review
Proposed branch: lp:~cafuego/memberdb/fixdatefmt
Merge into: lp:memberdb
Diff against target: 25 lines (+2/-2)
2 files modified
authenticated/edit-election.inc (+1/-1)
authenticated/view-election.inc (+1/-1)
To merge this branch: bzr merge lp:~cafuego/memberdb/fixdatefmt
Reviewer Review Type Date Requested Status
MemberDB Owners Pending
Review via email: mp+16613@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cafuego (cafuego) wrote :

Fix with fixed fix.

Reply

Unmerged revisions

378. By Cafuego

Stupid cafuego. H:i not H:j.

377. By Cafuego

Changed date format from HOUR:MONTH to HOUR:MINUTE :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'authenticated/edit-election.inc'
2--- authenticated/edit-election.inc 2008-07-28 22:01:20 +0000
3+++ authenticated/edit-election.inc 2009-12-28 00:23:13 +0000
4@@ -80,7 +80,7 @@
5 array('label'=>_('Time'),
6 'required'=>1,
7 'type'=>'text',
8- 'default'=>date("H:m"),
9+ 'default'=>date("H:i"),
10 'valid'=>array(
11 '$a = split(":",$val); return $a[0]>=0 && $a[0]<24 && $a[1]>=0 && $a[1]<60;'=>_('Not a valid time')),
12 ),
13
14=== modified file 'authenticated/view-election.inc'
15--- authenticated/view-election.inc 2008-01-09 08:50:25 +0000
16+++ authenticated/view-election.inc 2009-12-28 00:23:13 +0000
17@@ -28,7 +28,7 @@
18 <p><?=htmlise($election['desc'])?></p>
19
20 <h2><?=_('Times')?></h2>
21- <p><?=_('The current time is: ')?><?= date("d/m/Y H:m",time());?>. <?=_('All dates and times are server time, not your local time.')?></p>
22+ <p><?=_('The current time is: ')?><?= date("d/m/Y H:i",time());?>. <?=_('All dates and times are server time, not your local time.')?></p>
23 <table class="sortable" id="election_times">
24 <thead>
25 <tr>

Subscribers

People subscribed via source and target branches