Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 226408 - Replace 4 charset commands with just '/charset' and '/default-charset'.

Browse Source 
Bump version to 0.9.61.
r=rginda@hacksrus.com


git-svn-id: svn://10.0.0.236/trunk@153795 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
silver%warwickcompsoc.co.uk
2004-03-10 00:31:03 +00:00
parent 2cefb8b1dd
commit 101329e4d6
4 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/extensions/irc/xul/content/commands.js
View File

@@ -50,7 +50,6 @@ function initCommands()
["away", cmdAway, CMD_NEED_SRV | CMD_CONSOLE],
["cancel", cmdCancel, CMD_NEED_NET | CMD_CONSOLE],
["charset", cmdCharset, CMD_CONSOLE],
["channel-charset", cmdCharset, CMD_NEED_CHAN | CMD_CONSOLE],
["channel-motif", cmdMotif, CMD_NEED_CHAN | CMD_CONSOLE],
["channel-pref", cmdPref, CMD_NEED_CHAN | CMD_CONSOLE],
["cmd-copy", cmdCopy, 0],
@@ -66,6 +65,7 @@ function initCommands()
["client", cmdClient, CMD_CONSOLE],
["commands", cmdCommands, CMD_CONSOLE],
["ctcp", cmdCTCP, CMD_NEED_SRV | CMD_CONSOLE],
["default-charset", cmdCharset, CMD_CONSOLE],
["delete-view", cmdDeleteView, CMD_CONSOLE],
["disable-plugin", cmdAblePlugin, CMD_CONSOLE],
["disconnect", cmdDisconnect, CMD_NEED_SRV | CMD_CONSOLE],
@@ -98,7 +98,6 @@ function initCommands()
["msg", cmdMsg, CMD_NEED_SRV | CMD_CONSOLE],
["names", cmdNames, CMD_NEED_SRV | CMD_CONSOLE],
["network", cmdNetwork, CMD_CONSOLE],
["network-charset", cmdCharset, CMD_NEED_NET | CMD_CONSOLE],
["network-motif", cmdMotif, CMD_NEED_NET | CMD_CONSOLE],
["network-pref", cmdPref, CMD_NEED_NET | CMD_CONSOLE],
["networks", cmdNetworks, CMD_CONSOLE],
@@ -132,7 +131,6 @@ function initCommands()
["unignore", cmdIgnore, CMD_NEED_NET | CMD_CONSOLE],
["unstalk", cmdUnstalk, CMD_CONSOLE],
["usermode", cmdUsermode, CMD_CONSOLE],
["user-charset", cmdCharset, CMD_NEED_USER | CMD_CONSOLE],
["user-motif", cmdMotif, CMD_NEED_USER | CMD_CONSOLE],
["user-pref", cmdPref, CMD_NEED_USER | CMD_CONSOLE],
["version", cmdVersion, CMD_CONSOLE],
@@ -610,26 +608,16 @@ function cmdCharset(e)
{
var pm;
if (e.command.name == "channel-charset")
{
pm = e.channel.prefManager;
msg = MSG_CURRENT_CHARSET_CHAN;
}
else if (e.command.name == "network-charset")
{
pm = e.network.prefManager;
msg = MSG_CURRENT_CHARSET_NET;
}
else if (e.command.name == "user-charset")
{
pm = e.user.prefManager;
msg = MSG_CURRENT_CHARSET_USER;
}
else
if (e.command.name == "default-charset")
{
pm = client.prefManager;
msg = MSG_CURRENT_CHARSET;
}
else
{
pm = e.sourceObject.prefManager;
msg = MSG_CURRENT_CHARSET_VIEW;
}
if (e.newCharset)
{

2
mozilla/extensions/irc/xul/content/contents.rdf
View File

@@ -9,7 +9,7 @@
<!-- package information -->
<RDF:Description about="urn:mozilla:package:chatzilla"
chrome:displayName="ChatZilla 0.9.60"
chrome:displayName="ChatZilla 0.9.61"
chrome:author="mozilla.org"
chrome:authorURL="http://www.mozilla.org/projects/rt-messaging/chatzilla/"
chrome:description="A simple, straightforward Internet Relay Chat (IRC) client."

2
mozilla/extensions/irc/xul/content/static.js
View File

@@ -34,7 +34,7 @@
* Samuel Sieb, samuel@sieb.net, MIRC color codes, munger menu, and various
*/
const __cz_version = "0.9.60";
const __cz_version = "0.9.61";
const __cz_condition = "green";
var warn;

18
mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
View File

@@ -58,10 +58,7 @@ cmd.away.help = If <reason> is specified, sets you away with that message. Use
cmd.cancel.help = Cancels a /attach or /server command. Use /cancel when ChatZilla is repeatedly trying to attach to a network that is not responding, to tell ChatZilla to give up before the normal number of retries.
cmd.charset.params = [<new-charset>]
cmd.charset.help = Sets the character encoding mode to <new-charset>, or displays the current character encoding mode if <new-charset> is not provided.
cmd.channel-charset.params = [<new-charset> [<channel>]]
cmd.channel-charset.help = Sets the character encoding mode to <new-charset>, or displays the current character encoding mode if <new-charset> is not provided. If <channel> is not provided, the current channel will be assumed.
cmd.charset.help = Sets the character encoding mode for the current view to <new-charset>, or displays the current character encoding mode if <new-charset> is not provided.
cmd.channel-motif.params = [<motif> [<channel>]]
cmd.channel-motif.help = Sets the CSS file used for the message tab for this specific channel. <motif> can be a URL to a .css file, or the shortcut "default", "light", or "dark". If <motif> is a minus ('-') character, the motif will revert to the network motif. If <channel> is not provided, the current channel will be assumed. See the the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information on how to style ChatZilla. See also |motif|.
@@ -100,6 +97,9 @@ cmd.sync-windows.help = Syncronizes all views with their current output windo
cmd.ctcp.params = <target> <code> [<params>]
cmd.ctcp.help = Sends the CTCP code <code> to the target (user or channel) <target>. If <params> are specified they are sent along as well.
cmd.default-charset.params = [<new-charset>]
cmd.default-charset.help = Sets the global default character encoding mode to <new-charset>, or displays the current global default character encoding mode if <new-charset> is not provided.
cmd.delete-view.key = accel W
cmd.delete-view.label = &Close Tab
cmd.delete-view.params = [<view>]
@@ -297,9 +297,6 @@ cmd.network.help = Sets the current network to <network-name>
cmd.networks.help = Lists all available networks as clickable links.
cmd.network-charset.params = [<new-charset> [<network>]]
cmd.network-charset.help = Sets the character encoding mode to <new-charset>, or displays the current character encoding mode if <new-charset> is not provided. If <networks> is not provided, the current network will be assumed.
cmd.network-motif.params = [<motif> [<network>]]
cmd.network-motif.help = Sets the CSS file used for the message tab for the network <network>. <motif> can be a URL to a .css file, or the shortcut "default", "light", or "dark". If <motif> is a minus ('-') character, the motif will revert to the global motif. If <network> is not provided, the current network is assumed. See the the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information on how to style ChatZilla. See also |motif|.
@@ -388,9 +385,6 @@ cmd.disable-plugin.help = This command calls the plugin's disablePlugin functi
cmd.usermode.params = [<new-mode>]
cmd.usermode.help = Changes or displays the current user mode.
cmd.user-charset.params = [<new-charset> [<user>]]
cmd.user-charset.help = Sets the character encoding mode to <new-charset>, or displays the current character encoding mode if <new-charset> is not provided. If <user> is not provided, the current user will be assumed.
cmd.user-motif.params = [<motif> [<user>]]
cmd.user-motif.help = Sets the CSS file used for the message tab for the user <user>. <motif> can be a URL to a .css file, or the shortcut "default", "light", or "dark". If <motif> is a minus ('-') character, the motif will revert to the network motif. If <user> is not provided, the current user is assumed. See the the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information on how to style ChatZilla. See also |motif|.
@@ -545,9 +539,7 @@ msg.version.reply = Chatzilla %S [%S]
msg.nothing.to.cancel = No connection in progress, nothing to cancel.
msg.cancelling = Cancelling connection to ``%S''...
msg.current.charset = Using ``%S'' as default charset.
msg.current.charset.net = Using ``%S'' as default charset for this network.
msg.current.charset.chan = Using ``%S'' as charset for this channel.
msg.current.charset.user = Using ``%S'' as charset for this user.
msg.current.charset.view = Using ``%S'' as charset for this view.
msg.current.css = Using <%S> as default motif.
msg.current.css.net = Using <%S> as default motif for this network.
msg.current.css.chan = Using <%S> as motif for this channel.