Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Sarven Capadisli 2009-11-18 12:18:03 +00:00
commit 0ae7a1df6e
2 changed files with 7 additions and 1 deletions

6
README
View File

@ -852,6 +852,12 @@ locale_path: full path to the directory for locale data. Unless you
store all your locale data in one place, you probably store all your locale data in one place, you probably
don't need to use this. don't need to use this.
language: default language for your site. Defaults to US English. language: default language for your site. Defaults to US English.
Note that this is overridden if a user is logged in and has
selected a different language. It is also overridden if the
user is NOT logged in, but their browser requests a different
langauge. Since pretty much everybody's browser requests a
language, that means that changing this setting has little or
no effect in practice.
languages: A list of languages supported on your site. Typically you'd languages: A list of languages supported on your site. Typically you'd
only change this if you wanted to disable support for one only change this if you wanted to disable support for one
or another language: or another language:

View File

@ -576,6 +576,6 @@ create table login_token (
created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
modified timestamp /* comment 'date this record was modified'*/, modified timestamp /* comment 'date this record was modified'*/,
constraint primary key (user_id) primary key (user_id)
); );