On Sun, May 15, 2011 at 8:00 AM, Tom Willemsen wrote:

Signed-off-by: Tom Willemsen

The grammar checker in me strikes again: * If we're using full-stop punctuation (periods), we shouldn't be doing this lowercase stuff nor omitting one at the end. I think it makes more sense to use commas everywhere, no? * "change clock NTP" needs something else in there, e.g. "change clock using NTP" or "change clock with NTP". -Dan

---  releng/fixtures/clockchoices.json |   55 +++++++++++++++++++++++++++++++++++--  1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index f328801..da1f429 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -3,21 +3,70 @@        "pk": 1,        "model": "releng.clockchoice",        "fields": { -           "name": "unchanged" +           "name": "default region/timezone. keep clock"        }     },     {        "pk": 2,        "model": "releng.clockchoice",        "fields": { -           "name": "configured manually" +           "name": "default region/timezone. change clock manually (UTC)"        }     },     {        "pk": 3,        "model": "releng.clockchoice",        "fields": { -           "name": "NTP" +           "name": "default region/timezone. change clock NTP (UTC)" +       } +    }, +    { +       "pk": 4, +       "model": "releng.clockchoice", +       "fields": { +           "name": "default region/timezone. change clock manually (localtime)" +       } +    }, +    { +       "pk": 5, +       "model": "releng.clockchoice", +       "fields": { +           "name": "default region/timezone. change clock NTP (localtime)" +       } +    }, +    { +       "pk": 6, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone. keep clock" +       } +    }, +    { +       "pk": 7, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone. change clock manually (UTC)" +       } +    }, +    { +       "pk": 8, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone. change clock NTP (UTC)" +       } +    }, +    { +       "pk": 9, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone. change clock manually (localtime)" +       } +    }, +    { +       "pk": 10, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone. change clock NTP (localtime)"        }     }  ] -- 1.7.5.1

On Sun, May 15, 2011 at 12:14 PM, Tom Willemsen wrote:

Signed-off-by: Tom Willemsen

Thanks! One note below.

---  releng/fixtures/clockchoices.json |   55 +++++++++++++++++++++++++++++++++++--  1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index f328801..700adeb 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -3,21 +3,70 @@        "pk": 1,        "model": "releng.clockchoice",        "fields": { -           "name": "unchanged" +           "name": "default region/timezone, keep clock"        }     },     {        "pk": 2,        "model": "releng.clockchoice",        "fields": { -           "name": "configured manually" +           "name": "default region/timezone, change clock manually (UTC)"        }     },     {        "pk": 3,        "model": "releng.clockchoice",        "fields": { -           "name": "NTP" +           "name": "default region/timezone, change clock with NTP (UTC)" +       } +    }, +    { +       "pk": 4, +       "model": "releng.clockchoice", +       "fields": { +           "name": "default region/timezone, change clock manually (localtime)" +       } +    }, +    { +       "pk": 5, +       "model": "releng.clockchoice", +       "fields": { +           "name": "default region/timezone, change clock with NTP (localtime)" +       } +    },2 Failsauce on this line, I should have caught it sooner but no big deal: http://projects.archlinux.org/archweb.git/commit/?id=7c663a77b187e4592ce112d...

+    { +       "pk": 6, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone, keep clock" +       } +    }, +    { +       "pk": 7, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone, change clock manually (UTC)" +       } +    }, +    { +       "pk": 8, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone, change clock with NTP (UTC)" +       } +    }, +    { +       "pk": 9, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone, change clock manually (localtime)" +       } +    }, +    { +       "pk": 10, +       "model": "releng.clockchoice", +       "fields": { +           "name": "update region/timezone, change clock with NTP (localtime)"        }     }  ] -- 1.7.5.1