summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/update_translations.php145
-rwxr-xr-xscripts/xmppdaemon.php37
2 files changed, 123 insertions, 59 deletions
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 4d7adafea..2f4ca8720 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -1,66 +1,97 @@
+#!/usr/bin/env php
<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+ print "This script must be run from the command line\n";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+
+// Master Laconica .pot file location (created by update_pot.sh)
+$laconica_pot = INSTALLDIR . '/locale/laconica.po';
set_time_limit(60);
-chdir(dirname(__FILE__) . '/..');
/* Languages to pull */
-$languages = array(
- 'da_DK' => 'http://laconi.ca/translate/download.php?file_id=93',
- 'nl_NL' => 'http://laconi.ca/translate/download.php?file_id=97',
- 'en_NZ' => 'http://laconi.ca/translate/download.php?file_id=87',
- 'eo' => 'http://laconi.ca/translate/download.php?file_id=88',
- 'fr_FR' => 'http://laconi.ca/translate/download.php?file_id=99',
- 'de_DE' => 'http://laconi.ca/translate/download.php?file_id=100',
- 'it_IT' => 'http://laconi.ca/translate/download.php?file_id=101',
- 'ko' => 'http://laconi.ca/translate/download.php?file_id=102',
- 'no_NB' => 'http://laconi.ca/translate/download.php?file_id=104',
- 'pt' => 'http://laconi.ca/translate/download.php?file_id=106',
- 'pt_BR' => 'http://laconi.ca/translate/download.php?file_id=107',
- 'ru_RU' => 'http://laconi.ca/translate/download.php?file_id=109',
- 'es' => 'http://laconi.ca/translate/download.php?file_id=110',
- 'tr_TR' => 'http://laconi.ca/translate/download.php?file_id=114',
- 'uk_UA' => 'http://laconi.ca/translate/download.php?file_id=115',
- 'he_IL' => 'http://laconi.ca/translate/download.php?file_id=116',
- 'mk_MK' => 'http://laconi.ca/translate/download.php?file_id=103',
- 'ja_JP' => 'http://laconi.ca/translate/download.php?file_id=117',
- 'cs_CZ' => 'http://laconi.ca/translate/download.php?file_id=96',
- 'ca_ES' => 'http://laconi.ca/translate/download.php?file_id=95',
- 'pl_PL' => 'http://laconi.ca/translate/download.php?file_id=105',
- 'sv_SE' => 'http://laconi.ca/translate/download.php?file_id=128'
-);
+$languages = get_all_languages();
/* Update the languages */
-foreach ($languages as $code => $file) {
-
- $lcdir='locale/'.$code;
- $msgdir=$lcdir.'/LC_MESSAGES';
- $pofile=$msgdir.'/laconica.po';
- $mofile=$msgdir.'/laconica.mo';
-
- /* Check for an existing */
- if (!is_dir($msgdir)) {
- mkdir($lcdir);
- mkdir($msgdir);
- $existingSHA1 = '';
- } else {
- $existingSHA1 = file_exists($pofile) ? sha1_file($pofile) : '';
- }
-
- /* Get the remote one */
- $newFile = file_get_contents($file);
-
- // Update if the local .po file is different to the one downloaded, or
- // if the .mo file is not present.
- if(sha1($newFile)!=$existingSHA1 || !file_exists($mofile)) {
- echo "Updating ".$code."\n";
- file_put_contents($pofile, $newFile);
- $prevdir = getcwd();
- chdir($msgdir);
- system('msgmerge -U laconica.po ../../laconica.pot');
- system('msgfmt -f -o laconica.mo laconica.po');
- chdir($prevdir);
- } else {
- echo "Unchanged - ".$code."\n";
- }
+
+foreach ($languages as $language) {
+
+ $code = $language['lang'];
+ $file_url = 'http://laconi.ca/pootle/' . $code .
+ '/laconica/LC_MESSAGES/laconica.po';
+ $lcdir = INSTALLDIR . '/locale/' . $code;
+ $msgdir = "$lcdir/LC_MESSAGES";
+ $pofile = "$msgdir/laconica.po";
+ $mofile = "$msgdir/laconica.mo";
+
+ /* Check for an existing */
+ if (!is_dir($msgdir)) {
+ mkdir($lcdir);
+ mkdir($msgdir);
+ $existingSHA1 = '';
+ } else {
+ $existingSHA1 = file_exists($pofile) ? sha1_file($pofile) : '';
+ }
+
+ /* Get the remote one */
+ $new_file = curl_get_file($file_url);
+
+ if ($new_file === FALSE) {
+ echo "Couldn't retrieve .po file for $code: $file_url\n";
+ continue;
+ }
+
+ // Update if the local .po file is different to the one downloaded, or
+ // if the .mo file is not present.
+ if (sha1($new_file) != $existingSHA1 || !file_exists($mofile)) {
+ echo "Updating ".$code."\n";
+ file_put_contents($pofile, $new_file);
+ system(sprintf('msgmerge -U %s %s', $pofile, $laconica_pot));
+ system(sprintf('msgfmt -f -o %s %s', $mofile, $pofile));
+ } else {
+ echo "Unchanged - ".$code."\n";
+ }
}
+
echo "Finished\n";
+
+
+function curl_get_file($url)
+{
+ $c = curl_init();
+ curl_setopt($c, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($c, CURLOPT_URL, $url);
+ $contents = curl_exec($c);
+ curl_close($c);
+
+ if (!empty($contents)) {
+ return $contents;
+ }
+
+ return FALSE;
+}
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index ca6218120..488b4b514 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -60,7 +60,9 @@ class XMPPDaemon extends Daemon
$this->resource = common_config('xmpp', 'resource') . 'daemon';
}
- $this->log(LOG_INFO, "INITIALIZE XMPPDaemon {$this->user}@{$this->server}/{$this->resource}");
+ $this->jid = $this->user.'@'.$this->server.'/'.$this->resource;
+
+ $this->log(LOG_INFO, "INITIALIZE XMPPDaemon {$this->jid}");
}
function connect()
@@ -106,16 +108,36 @@ class XMPPDaemon extends Daemon
$this->log(LOG_DEBUG, "Beginning processing loop.");
- $this->conn->process();
+ while ($this->conn->processTime(60)) {
+ $this->sendPing();
+ }
}
}
+ function sendPing()
+ {
+ if (!isset($this->pingid)) {
+ $this->pingid = 0;
+ } else {
+ $this->pingid++;
+ }
+
+ $this->log(LOG_DEBUG, "Sending ping #{$this->pingid}");
+
+ $this->conn->send("<iq from='{$this->jid}' to='{$this->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
+ }
+
function handle_reconnect(&$pl)
{
$this->log(LOG_DEBUG, "Got reconnection callback.");
$this->conn->processUntil('session_start');
$this->log(LOG_DEBUG, "Sending reconnection presence.");
$this->conn->presence('Send me a message to post a notice', 'available', null, 'available', 100);
+ unset($pl['xml']);
+ $pl['xml'] = null;
+
+ $pl = null;
+ unset($pl);
}
function get_user($from)
@@ -189,6 +211,12 @@ class XMPPDaemon extends Daemon
$user->free();
unset($user);
+
+ unset($pl['xml']);
+ $pl['xml'] = null;
+
+ $pl = null;
+ unset($pl);
}
function is_self($from)
@@ -334,6 +362,11 @@ class XMPPDaemon extends Daemon
}
break;
}
+ unset($pl['xml']);
+ $pl['xml'] = null;
+
+ $pl = null;
+ unset($pl);
}
function log($level, $msg)