summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-19 12:51:25 -0700
committerBrion Vibber <brion@pobox.com>2010-05-19 12:51:25 -0700
commit7005ef66617b265ddccdd9082c2368bf014a7e83 (patch)
tree52f853c4d47063f0af488a7ff5fb52df50b430bb /lib/util.php
parent48dc899acb9a0ac87140353092dab1f5e67753d8 (diff)
parenta39a934dd4a133bad6e76fa9a5018cedcb70225c (diff)
Merge branch 'testing' into 0.9.x
Conflicts: plugins/OpenID/openidlogin.php
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php17
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/util.php b/lib/util.php
index 3e3153094..1e58f960c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -34,6 +34,14 @@ function common_user_error($msg, $code=400)
$err->showPage();
}
+/**
+ * This should only be used at setup; processes switching languages
+ * to send text to other users should use common_switch_locale().
+ *
+ * @param string $language Locale language code (optional; empty uses
+ * current user's preference or site default)
+ * @return mixed success
+ */
function common_init_locale($language=null)
{
if(!$language) {
@@ -50,6 +58,15 @@ function common_init_locale($language=null)
return $ok;
}
+/**
+ * Initialize locale and charset settings and gettext with our message catalog,
+ * using the current user's language preference or the site default.
+ *
+ * This should generally only be run at framework initialization; code switching
+ * languages at runtime should call common_switch_language().
+ *
+ * @access private
+ */
function common_init_language()
{
mb_internal_encoding('UTF-8');