From c9c316db7f003e018202e6c9f39770c208aecc05 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 22 Dec 2009 07:02:46 -0800 Subject: Ticket 2083: use site.textlimit setting instead of hardcoding 140 into documentation --- doc-src/about | 2 +- doc-src/help | 4 ++-- doc-src/im | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'doc-src') diff --git a/doc-src/about b/doc-src/about index 21f4dbf15..6a68e41cf 100644 --- a/doc-src/about +++ b/doc-src/about @@ -3,7 +3,7 @@ based on the Free Software [StatusNet](http://status.net/) tool. If you [register](%%action.register%%) for an account, -you can post small (140 chars or less) text notices +you can post small (%%site.textlimit%% chars or less) text notices about yourself, where you are, what you're doing, or practically anything you want. You can also subscribe to the notices of your friends, or other people you're interested in, and follow them on the diff --git a/doc-src/help b/doc-src/help index 93300ab24..37a8d11f7 100644 --- a/doc-src/help +++ b/doc-src/help @@ -1,4 +1,4 @@ -%%site.name%% is a **microblogging service**. Users post short (140 +%%site.name%% is a **microblogging service**. Users post short (%%site.textlimit%% character) notices which are broadcast to their friends and fans using the Web, RSS, or instant messages. @@ -30,4 +30,4 @@ Here are some documents that you might find helpful in understanding * [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy * [Source](%%doc.source%%) - How to get the StatusNet source code * [Badge](%%doc.badge%%) - How to put a StatusNet badge on your blog or homepage -* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages \ No newline at end of file +* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages diff --git a/doc-src/im b/doc-src/im index 631f6d9bb..eda4f6fc5 100644 --- a/doc-src/im +++ b/doc-src/im @@ -20,7 +20,7 @@ Sending updates --------------- You send updates by sending messages to %%xmpp.user%%@%%xmpp.server%%. Messages -should be less than 140 characters; longer messages will be truncated. +should be less than %%site.textlimit%% characters; longer messages will be truncated. Commands -------- -- cgit v1.2.3-54-g00ecf From 5d9a2eb17e3f6e3bc73b5aa80625a365761b6689 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 6 Jan 2010 14:42:46 -0800 Subject: Ticket 2107: remove "not implemented" items from sms/xmpp help; nobody likes being told what they can't do! Also broke up the localized help message into line-by-line pieces to ease translation maintenance. --- doc-src/sms | 11 +-------- lib/command.php | 74 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 38 insertions(+), 47 deletions(-) (limited to 'doc-src') diff --git a/doc-src/sms b/doc-src/sms index 1a3064318..2c20921c3 100644 --- a/doc-src/sms +++ b/doc-src/sms @@ -56,13 +56,4 @@ You can use the following commands with %%site.name%%. * sub <nickname> - same as 'follow' * unsub <nickname> - same as 'leave' * last <nickname> - same as 'get' -* on <nickname> - not yet implemented. -* off <nickname> - not yet implemented. -* nudge <nickname> - not yet implemented. -* invite <phone number> - not yet implemented. -* track <word> - not yet implemented. -* untrack <word> - not yet implemented. -* track off - not yet implemented. -* untrack all - not yet implemented. -* tracks - not yet implemented. -* tracking - not yet implemented. +* nudge <nickname> - remind a user to update. diff --git a/lib/command.php b/lib/command.php index 67140c348..ad2e0bb97 100644 --- a/lib/command.php +++ b/lib/command.php @@ -742,42 +742,42 @@ class HelpCommand extends Command function execute($channel) { $channel->output($this->user, - _("Commands:\n". - "on - turn on notifications\n". - "off - turn off notifications\n". - "help - show this help\n". - "follow - subscribe to user\n". - "groups - lists the groups you have joined\n". - "subscriptions - list the people you follow\n". - "subscribers - list the people that follow you\n". - "leave - unsubscribe from user\n". - "d - direct message to user\n". - "get - get last notice from user\n". - "whois - get profile info on user\n". - "fav - add user's last notice as a 'fave'\n". - "fav # - add notice with the given id as a 'fave'\n". - "repeat # - repeat a notice with a given id\n". - "repeat - repeat the last notice from user\n". - "reply # - reply to notice with a given id\n". - "reply - reply to the last notice from user\n". - "join - join group\n". - "login - Get a link to login to the web interface\n". - "drop - leave group\n". - "stats - get your stats\n". - "stop - same as 'off'\n". - "quit - same as 'off'\n". - "sub - same as 'follow'\n". - "unsub - same as 'leave'\n". - "last - same as 'get'\n". - "on - not yet implemented.\n". - "off - not yet implemented.\n". - "nudge - remind a user to update.\n". - "invite - not yet implemented.\n". - "track - not yet implemented.\n". - "untrack - not yet implemented.\n". - "track off - not yet implemented.\n". - "untrack all - not yet implemented.\n". - "tracks - not yet implemented.\n". - "tracking - not yet implemented.\n")); + _("Commands:")."\n". + _("on - turn on notifications")."\n". + _("off - turn off notifications")."\n". + _("help - show this help")."\n". + _("follow - subscribe to user")."\n". + _("groups - lists the groups you have joined")."\n". + _("subscriptions - list the people you follow")."\n". + _("subscribers - list the people that follow you")."\n". + _("leave - unsubscribe from user")."\n". + _("d - direct message to user")."\n". + _("get - get last notice from user")."\n". + _("whois - get profile info on user")."\n". + _("fav - add user's last notice as a 'fave'")."\n". + _("fav # - add notice with the given id as a 'fave'")."\n". + _("repeat # - repeat a notice with a given id")."\n". + _("repeat - repeat the last notice from user")."\n". + _("reply # - reply to notice with a given id")."\n". + _("reply - reply to the last notice from user")."\n". + _("join - join group")."\n". + #_("login - Get a link to login to the web interface")."\n". + _("drop - leave group")."\n". + _("stats - get your stats")."\n". + _("stop - same as 'off'")."\n". + _("quit - same as 'off'")."\n". + _("sub - same as 'follow'")."\n". + _("unsub - same as 'leave'")."\n". + _("last - same as 'get'")."\n". + #_("on - not yet implemented.")."\n". + #_("off - not yet implemented.")."\n". + _("nudge - remind a user to update.")."\n"); + #_("invite - not yet implemented.")."\n". + #_("track - not yet implemented.")."\n". + #_("untrack - not yet implemented.")."\n". + #_("track off - not yet implemented.")."\n". + #_("untrack all - not yet implemented.")."\n". + #_("tracks - not yet implemented.")."\n". + #_("tracking - not yet implemented.")."\n" } } -- cgit v1.2.3-54-g00ecf From f4fa785fb7cf6f222f77ad81f6a1e50e5af7fdf3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 6 Jan 2010 23:24:24 -0800 Subject: Revert "Ticket 2107: remove "not implemented" items from sms/xmpp help; nobody likes being told what they can't do!" This reverts commit 5d9a2eb17e3f6e3bc73b5aa80625a365761b6689. These are commands that are/were implemented by Twitter, and we don't (yet) implemented. People will be looking for that information. --- doc-src/sms | 11 ++++++++- lib/command.php | 74 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 47 insertions(+), 38 deletions(-) (limited to 'doc-src') diff --git a/doc-src/sms b/doc-src/sms index 2c20921c3..1a3064318 100644 --- a/doc-src/sms +++ b/doc-src/sms @@ -56,4 +56,13 @@ You can use the following commands with %%site.name%%. * sub <nickname> - same as 'follow' * unsub <nickname> - same as 'leave' * last <nickname> - same as 'get' -* nudge <nickname> - remind a user to update. +* on <nickname> - not yet implemented. +* off <nickname> - not yet implemented. +* nudge <nickname> - not yet implemented. +* invite <phone number> - not yet implemented. +* track <word> - not yet implemented. +* untrack <word> - not yet implemented. +* track off - not yet implemented. +* untrack all - not yet implemented. +* tracks - not yet implemented. +* tracking - not yet implemented. diff --git a/lib/command.php b/lib/command.php index ad2e0bb97..67140c348 100644 --- a/lib/command.php +++ b/lib/command.php @@ -742,42 +742,42 @@ class HelpCommand extends Command function execute($channel) { $channel->output($this->user, - _("Commands:")."\n". - _("on - turn on notifications")."\n". - _("off - turn off notifications")."\n". - _("help - show this help")."\n". - _("follow - subscribe to user")."\n". - _("groups - lists the groups you have joined")."\n". - _("subscriptions - list the people you follow")."\n". - _("subscribers - list the people that follow you")."\n". - _("leave - unsubscribe from user")."\n". - _("d - direct message to user")."\n". - _("get - get last notice from user")."\n". - _("whois - get profile info on user")."\n". - _("fav - add user's last notice as a 'fave'")."\n". - _("fav # - add notice with the given id as a 'fave'")."\n". - _("repeat # - repeat a notice with a given id")."\n". - _("repeat - repeat the last notice from user")."\n". - _("reply # - reply to notice with a given id")."\n". - _("reply - reply to the last notice from user")."\n". - _("join - join group")."\n". - #_("login - Get a link to login to the web interface")."\n". - _("drop - leave group")."\n". - _("stats - get your stats")."\n". - _("stop - same as 'off'")."\n". - _("quit - same as 'off'")."\n". - _("sub - same as 'follow'")."\n". - _("unsub - same as 'leave'")."\n". - _("last - same as 'get'")."\n". - #_("on - not yet implemented.")."\n". - #_("off - not yet implemented.")."\n". - _("nudge - remind a user to update.")."\n"); - #_("invite - not yet implemented.")."\n". - #_("track - not yet implemented.")."\n". - #_("untrack - not yet implemented.")."\n". - #_("track off - not yet implemented.")."\n". - #_("untrack all - not yet implemented.")."\n". - #_("tracks - not yet implemented.")."\n". - #_("tracking - not yet implemented.")."\n" + _("Commands:\n". + "on - turn on notifications\n". + "off - turn off notifications\n". + "help - show this help\n". + "follow - subscribe to user\n". + "groups - lists the groups you have joined\n". + "subscriptions - list the people you follow\n". + "subscribers - list the people that follow you\n". + "leave - unsubscribe from user\n". + "d - direct message to user\n". + "get - get last notice from user\n". + "whois - get profile info on user\n". + "fav - add user's last notice as a 'fave'\n". + "fav # - add notice with the given id as a 'fave'\n". + "repeat # - repeat a notice with a given id\n". + "repeat - repeat the last notice from user\n". + "reply # - reply to notice with a given id\n". + "reply - reply to the last notice from user\n". + "join - join group\n". + "login - Get a link to login to the web interface\n". + "drop - leave group\n". + "stats - get your stats\n". + "stop - same as 'off'\n". + "quit - same as 'off'\n". + "sub - same as 'follow'\n". + "unsub - same as 'leave'\n". + "last - same as 'get'\n". + "on - not yet implemented.\n". + "off - not yet implemented.\n". + "nudge - remind a user to update.\n". + "invite - not yet implemented.\n". + "track - not yet implemented.\n". + "untrack - not yet implemented.\n". + "track off - not yet implemented.\n". + "untrack all - not yet implemented.\n". + "tracks - not yet implemented.\n". + "tracking - not yet implemented.\n")); } } -- cgit v1.2.3-54-g00ecf