This merges the 'clock_timezone_type' and 'clock_custom_timezone' variables, since the values are exclusive to each other.
It makes the surrounding a little (!) heavier, but I think it is cleaner that way. Also comes with a little code clean-up, for instance the help text for D7 was still referencing D6 paths, and the SimpleTests had all the t()'s.

Haven't written upgrade path yet (For D6).

Note that this doesn't pass the tests yet, will have to clean it up before committing.

Comments

tstoeckler’s picture

StatusFileSize
new30.02 KB

Committed the attached patch.
Everything works fine, now.
Except for the states.js. Will look into that now.
http://drupal.org/cvs?commit=398560
http://drupal.org/cvs?commit=398432

tstoeckler’s picture

Status:Needs work» Fixed
StatusFileSize
new354 bytes

Quick follow-up patch. Only applies for HEAD (this was fixed already in 7-1.x for whatever reason).
http://drupal.org/cvs?commit=398570

Marking fixed. Please reopen if you encounter problems.

tstoeckler’s picture

StatusFileSize
new620 bytes

Ahh, forgot to fix one small little detail before committing. The update function doesn't give you a nice return message.
Here we go.
http://drupal.org/cvs?commit=398578
http://drupal.org/cvs?commit=398580

Status:Fixed» Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

tstoeckler’s picture

Version:7.x-1.x-dev» 6.x-1.x-dev
Status:Closed (fixed)» Fixed

Leftover t()'s in clock.test.

http://drupal.org/cvs?commit=433090

Status:Fixed» Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.