diff options
| -rw-r--r-- | README | 20 | ||||
| -rw-r--r-- | htaccess.sample | 2 | ||||
| -rw-r--r-- | js/jcrop/jquery.Jcrop.go.js | 8 | ||||
| -rw-r--r-- | lib/common.php | 3 | ||||
| -rw-r--r-- | locale/ko_KR/LC_MESSAGES/statusnet.mo | bin | 88928 -> 88929 bytes | |||
| -rw-r--r-- | locale/ko_KR/LC_MESSAGES/statusnet.po | 2 | ||||
| -rw-r--r-- | plugins/FBConnect/FBConnectPlugin.css | 8 | ||||
| -rw-r--r-- | plugins/FBConnect/README | 30 | ||||
| -rw-r--r-- | plugins/InfiniteScroll/readme.txt | 2 | ||||
| -rw-r--r-- | plugins/recaptcha/README | 2 | ||||
| -rw-r--r-- | scripts/commandline.inc | 6 | ||||
| -rw-r--r-- | scripts/statusnet.spec | 10 | ||||
| -rwxr-xr-x | scripts/twitterstatusfetcher.php | 2 | ||||
| -rwxr-xr-x | scripts/update_pot.sh | 2 | ||||
| -rwxr-xr-x | scripts/update_translations.php | 4 |
15 files changed, 51 insertions, 50 deletions
@@ -60,7 +60,7 @@ License along with this program, in the file "COPYING". If not, see you *MUST MAKE AVAILABLE* the modified version of the source code to your users under the same license. This is a legal requirement of using the software, and if you do not wish to share your - modifications, *YOU MAY NOT INSTALL LACONICA*. + modifications, *YOU MAY NOT INSTALL STATUSNET*. Additional library software has been made available in the 'extlib' directory. All of it is Free Software and can be distributed under @@ -910,7 +910,7 @@ Starting with version 0.7.1, you can put config files in the /etc/statusnet/ directory on your server, if it exists. Config files will be included in this order: -* /etc/statusnet/laconica.php - server-wide config +* /etc/statusnet/statusnet.php - server-wide config * /etc/statusnet/<servername>.php - for a virtual host * /etc/statusnet/<servername>_<pathname>.php - for a path * INSTALLDIR/config.php - for a particular implementation @@ -1622,15 +1622,15 @@ Credits ======= The following is an incomplete list of developers who've worked on -Laconi.ca. Apologies for any oversight; please let evan@identi.ca know +StatusNet. Apologies for any oversight; please let evan@status.net know if anyone's been overlooked in error. -* Evan Prodromou, founder and lead developer, Control Yourself, Inc. -* Zach Copley, Control Yourself, Inc. -* Earle Martin, Control Yourself, Inc. -* Marie-Claude Doyon, designer, Control Yourself, Inc. -* Sarven Capadisli, Control Yourself, Inc. -* Robin Millette, Control Yourself, Inc. +* Evan Prodromou, founder and lead developer, StatusNet, Inc. +* Zach Copley, StatusNet, Inc. +* Earle Martin, StatusNet, Inc. +* Marie-Claude Doyon, designer, StatusNet, Inc. +* Sarven Capadisli, StatusNet, Inc. +* Robin Millette, StatusNet, Inc. * Ciaran Gultnieks * Michael Landers * Ori Avtalion @@ -1662,6 +1662,6 @@ if anyone's been overlooked in error. * Craig Andrews Thanks also to the developers of our upstream library code and to the -thousands of people who have tried out Identi.ca, installed Laconi.ca, +thousands of people who have tried out Identi.ca, installed StatusNet, told their friends, and built the Open Microblogging network to what it is today. diff --git a/htaccess.sample b/htaccess.sample index 942e98334..37eb8e01e 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -1,7 +1,7 @@ <IfModule mod_rewrite.c> RewriteEngine On - # NOTE: change this to your actual Laconica path; may be "/". + # NOTE: change this to your actual StatusNet path; may be "/". RewriteBase /mublog/ diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js index 4e1cbfd1e..5739f676d 100644 --- a/js/jcrop/jquery.Jcrop.go.js +++ b/js/jcrop/jquery.Jcrop.go.js @@ -1,10 +1,10 @@ /** Init for Jcrop library and page setup * - * @package Laconica - * @author Sarven Capadisli <csarven@controlyourself.ca> - * @copyright 2009 Control Yourself, Inc. + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ $(function(){ diff --git a/lib/common.php b/lib/common.php index c3e83789f..9a5d33e65 100644 --- a/lib/common.php +++ b/lib/common.php @@ -341,7 +341,8 @@ function addPlugin($name, $attrs = null) if (isset($conffile)) { $_config_files = array($conffile); } else { - $_config_files = array('/etc/statusnet/laconica.php', + $_config_files = array('/etc/statusnet/statusnet.php', + '/etc/laconica/laconica.php', '/etc/statusnet/'.$_server.'.php'); if (strlen($_path) > 0) { diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.mo b/locale/ko_KR/LC_MESSAGES/statusnet.mo Binary files differindex e7fb77d61..2b177ff86 100644 --- a/locale/ko_KR/LC_MESSAGES/statusnet.mo +++ b/locale/ko_KR/LC_MESSAGES/statusnet.mo diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.po b/locale/ko_KR/LC_MESSAGES/statusnet.po index dd7edc510..7bbdcdcf2 100644 --- a/locale/ko_KR/LC_MESSAGES/statusnet.po +++ b/locale/ko_KR/LC_MESSAGES/statusnet.po @@ -1104,7 +1104,7 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" -"이 사이트는 [StatusNet](http://status.net/) 마이크로블로깅 소프트웨어 %s 버전을 사용합니다. Laconica는 " +"이 사이트는 [StatusNet](http://status.net/) 마이크로블로깅 소프트웨어 %s 버전을 사용합니다. StatusNet는 " "[GNU Affero General Public " "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 " "있습니다." diff --git a/plugins/FBConnect/FBConnectPlugin.css b/plugins/FBConnect/FBConnectPlugin.css index e52675459..49217bf13 100644 --- a/plugins/FBConnect/FBConnectPlugin.css +++ b/plugins/FBConnect/FBConnectPlugin.css @@ -1,10 +1,10 @@ /** Styles for Facebook logo and Facebook user profile avatar. * - * @package Laconica - * @author Sarven Capadisli <csarven@controlyourself.ca> - * @copyright 2009 Control Yourself, Inc. + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ #site_nav_global_primary #nav_fb { diff --git a/plugins/FBConnect/README b/plugins/FBConnect/README index 11e5ce453..77d57eff9 100644 --- a/plugins/FBConnect/README +++ b/plugins/FBConnect/README @@ -1,18 +1,18 @@ -This plugin allows you to utilize Facebook Connect with Laconica. +This plugin allows you to utilize Facebook Connect with StatusNet. Supported Facebook Connect features: - Authenticate (register/login/logout -- works similar to OpenID) -- Associate an existing Laconica account with a Facebook account -- Disconnect a Facebook account from a Laconica account +- Associate an existing StatusNet account with a Facebook account +- Disconnect a Facebook account from a StatusNet account Future planned functionality: -- Invite Facebook friends to use your Laconica installation -- Auto-subscribe Facebook friends already using Laconica -- Share Laconica favorite notices to your Facebook stream +- Invite Facebook friends to use your StatusNet installation +- Auto-subscribe Facebook friends already using StatusNet +- Share StatusNet favorite notices to your Facebook stream To use the plugin you will need to configure a Facebook application -to point to your Laconica installation (see the Installation section +to point to your StatusNet installation (see the Installation section below). Installation @@ -26,16 +26,16 @@ Facebook developer wiki: http://wiki.developers.facebook.com/index.php/Connect/Setting_Up_Your_Site -If you already are using the build-in Laconica Facebook application, +If you already are using the build-in StatusNet Facebook application, you can modify your existing application's configuration using the Facebook Developer Application on Facebook. Use it to edit your application settings, and under the 'Connect' tab, change the 'Connect -URL' to be the main URL for your Laconica site. E.g.: +URL' to be the main URL for your StatusNet site. E.g.: - http://SITE/PATH_TO_LACONICA/ + http://SITE/PATH_TO_STATUSNET/ After you application is created and configured, you'll need to add its -API key and secret to your Laconica config.php file: +API key and secret to your StatusNet config.php file: $config['facebook']['apikey'] = 'APIKEY'; $config['facebook']['secret'] = 'SECRET'; @@ -47,11 +47,11 @@ config.php: To try out the plugin, fire up your browser and connect to: - http://SITE/PATH_TO_LACONICA/main/facebooklogin + http://SITE/PATH_TO_STATUSNET/main/facebooklogin or, if you do not have fancy URLs turned on: - http://SITE/PATH_TO_LACONICA/index.php/main/facebooklogin + http://SITE/PATH_TO_STATUSNET/index.php/main/facebooklogin You should see a page with a blue button that says: "Connect with Facebook". @@ -62,10 +62,10 @@ Connect/Disconnect existing account If the Facebook Connect plugin is enabled, there will be a new Facebook Connect Settings tab under each user's Connect menu. Users can connect and disconnect to their Facebook accounts from it. Note: Before a user -can disconnect from Facebook, she must set a normal Laconica password. +can disconnect from Facebook, she must set a normal StatusNet password. Otherwise, she might not be able to login in to her account in the future. This is usually only required for users who have used Facebook -Connect to register their Laconica account, and therefore haven't +Connect to register their StatusNet account, and therefore haven't already set a local password. Helpful links diff --git a/plugins/InfiniteScroll/readme.txt b/plugins/InfiniteScroll/readme.txt index 3ce3b7fd2..2428cc69a 100644 --- a/plugins/InfiniteScroll/readme.txt +++ b/plugins/InfiniteScroll/readme.txt @@ -1,4 +1,4 @@ -Infinite Scroll adds the following functionality to your Laconica installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness. +Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness. Installation ============ diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README index 3100f697e..ce23a2695 100644 --- a/plugins/recaptcha/README +++ b/plugins/recaptcha/README @@ -1,4 +1,4 @@ -Laconica reCAPTCHA plugin 0.2 8/3/09 +StatusNet reCAPTCHA plugin 0.2 8/3/09 ==================================== Adds a captcha to your registration page to reduce automated spam bots registering. diff --git a/scripts/commandline.inc b/scripts/commandline.inc index 3b6ef6098..1573b569d 100644 --- a/scripts/commandline.inc +++ b/scripts/commandline.inc @@ -1,7 +1,7 @@ <?php /* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, 2009, Control Yourself, Inc. + * StatusNet - a distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, 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 @@ -26,7 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { exit(); } -define('LACONICA', true); +define('STATUSNET', true); // Set various flags so we don't time out on long-running processes diff --git a/scripts/statusnet.spec b/scripts/statusnet.spec index 2019d8abb..ca2e483a7 100644 --- a/scripts/statusnet.spec +++ b/scripts/statusnet.spec @@ -10,7 +10,7 @@ Release: 1%{?dist} License: GAGPL v3 or later Source: statusnet-%{version}.tar.gz Group: Applications/Internet -Summary: Laconica, the Open Source microblogging platform +Summary: StatusNet, the Open Source microblogging platform BuildArch: noarch Requires: httpd @@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define confpath %{_sysconfdir}/%{name} %description -From the ABOUT file: Laconica (pronounced "luh-KAWN-ih-kuh") is a Free +From the ABOUT file: StatusNet (pronounced "luh-KAWN-ih-kuh") is a Free and Open Source microblogging platform. It helps people in a community, company or group to exchange short (140 character) messages over the Web. Users can choose which people to "follow" and receive @@ -56,7 +56,7 @@ mkdir -p %{buildroot}%{_datadir}/statusnet/avatar mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/statusnet.conf <<"EOF" -Alias /statusnet/ "/var/www/laconica/" +Alias /statusnet/ "/var/www/statusnet/" <Directory "/var/www/statusnet"> Options Indexes FollowSymLinks @@ -79,13 +79,13 @@ rm -rf %buildroot %config(noreplace) %{_sysconfdir}/httpd/conf.d/statusnet.conf %changelog -* Wed Apr 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.3 +* Wed Apr 03 2009 Zach Copley <zach@status.net> - 0.7.3 - Changed version number to 0.7.3. * Fri Mar 13 2009 Ken Sedgwick <ksedgwic@bonsai.com> - 0.7.2.1-1 - Factored statusnet version to the first line of the file. -* Wed Mar 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.2 +* Wed Mar 03 2009 Zach Copley <zach@status.net> - 0.7.2 - Changed version number to 0.7.2. * Sat Feb 28 2009 Ken Sedgwick <ken@bonsai.com> - 0.7.1-1 diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php index 9a74ae99d..68f7e9bf7 100755 --- a/scripts/twitterstatusfetcher.php +++ b/scripts/twitterstatusfetcher.php @@ -478,7 +478,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon default: // Note: Twitter's big avatars are a different size than - // StatusNet's (Laconica's = 96) + // StatusNet's (StatusNet's = 96) $avatar->width = 73; $avatar->height = 73; diff --git a/scripts/update_pot.sh b/scripts/update_pot.sh index dbbe4354f..9419e4337 100755 --- a/scripts/update_pot.sh +++ b/scripts/update_pot.sh @@ -1,3 +1,3 @@ cd `dirname $0` cd .. -xgettext --from-code=UTF-8 --default-domain=statusnet --output=locale/laconica.po --language=PHP --join-existing actions/*.php classes/*.php lib/*.php scripts/*.php +xgettext --from-code=UTF-8 --default-domain=statusnet --output=locale/statusnet.po --language=PHP --join-existing actions/*.php classes/*.php lib/*.php scripts/*.php diff --git a/scripts/update_translations.php b/scripts/update_translations.php index 1f291dc42..4f02b55ec 100755 --- a/scripts/update_translations.php +++ b/scripts/update_translations.php @@ -30,7 +30,7 @@ define('STATUSNET', true); require_once(INSTALLDIR . '/lib/common.php'); // Master StatusNet .pot file location (created by update_pot.sh) -$statusnet_pot = INSTALLDIR . '/locale/laconica.po'; +$statusnet_pot = INSTALLDIR . '/locale/statusnet.po'; set_time_limit(60); @@ -43,7 +43,7 @@ foreach ($languages as $language) { $code = $language['lang']; $file_url = 'http://status.net/pootle/' . $code . - '/statusnet/LC_MESSAGES/laconica.po'; + '/statusnet/LC_MESSAGES/statusnet.po'; $lcdir = INSTALLDIR . '/locale/' . $code; $msgdir = "$lcdir/LC_MESSAGES"; $pofile = "$msgdir/statusnet.po"; |