We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 0ae7a1df authored by Sarven Capadisli's avatar Sarven Capadisli

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

parents 1c1c9ccc d1d104bd
...@@ -852,6 +852,12 @@ locale_path: full path to the directory for locale data. Unless you ...@@ -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:
......
...@@ -576,6 +576,6 @@ create table login_token ( ...@@ -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)
); );
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment