summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-22 14:13:28 -0500
committerEvan Prodromou <evan@status.net>2010-01-22 14:13:28 -0500
commit104d300799c0817bdbe893f08fd9b46d37a75a80 (patch)
tree027871445bd2dc493e0038e7c11578e08a426ea7
parent9f815c968f855b75e82224d85314007ec0613aad (diff)
do actual language negotiation for help docs
-rw-r--r--actions/doc.php38
1 files changed, 28 insertions, 10 deletions
diff --git a/actions/doc.php b/actions/doc.php
index 99c2c7966..25d363472 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -51,6 +51,8 @@ class DocAction extends Action
function prepare($args)
{
+ parent::prepare($args);
+
$this->title = $this->trimmed('title');
$this->output = null;
@@ -163,25 +165,41 @@ class DocAction extends Action
function getFilename()
{
- $local = array_merge(glob(INSTALLDIR.'/local/doc-src/'.$this->title),
- glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*'));
+ if (file_exists(INSTALLDIR.'/local/doc-src/'.$this->title)) {
+ $localDef = INSTALLDIR.'/local/doc-src/'.$this->title;
+ }
+
+ $local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
+
+ if (count($local) || isset($localDef)) {
+ return $this->negotiateLanguage($local, $localDef);
+ }
- if (count($local)) {
- return $this->negotiateLanguage($local);
+ if (file_exists(INSTALLDIR.'/doc-src/'.$this->title)) {
+ $distDef = INSTALLDIR.'/doc-src/'.$this->title;
}
- $dist = array_merge(glob(INSTALLDIR.'/doc-src/'.$this->title),
- glob(INSTALLDIR.'/doc-src/'.$this->title.'.*'));
+ $dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
- if (count($dist)) {
- return $this->negotiateLanguage($dist);
+ if (count($dist) || isset($distDef)) {
+ return $this->negotiateLanguage($dist, $distDef);
}
return null;
}
- function negotiateLanguage($files)
+ function negotiateLanguage($filenames, $defaultFilename=null)
{
- // FIXME: write this
+ // XXX: do this better
+
+ $langcode = common_language();
+
+ foreach ($filenames as $filename) {
+ if (preg_match('/\.'.$langcode.'$/', $filename)) {
+ return $filename;
+ }
+ }
+
+ return $defaultFilename;
}
}