*
* x3 is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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,
struct language *lang_C;
struct dict *languages;
-static void language_cleanup(void)
+static void language_cleanup(UNUSED_ARG(void *extra))
{
dict_delete(languages);
}
/* Read all the translations from the directory. */
while ((dirent = readdir(dir))) {
snprintf(filename, sizeof(filename), "languages/%s/%s", name, dirent->d_name);
- if (!strcmp(dirent->d_name,"parent")) {
+ if (!strcmp(dirent->d_name, "parent")) {
continue;
} else if (!strcmp(dirent->d_name, "strings.db")) {
dict = parse_database(filename);
if (dirent->d_name[0] == '.')
continue;
snprintf(namebuf, sizeof(namebuf), "languages/%s", dirent->d_name);
+ if (!strcmp(dirent->d_name, "strings.db")) {
+ continue;
+ }
if (stat(namebuf, &sbuf) < 0) {
log_module(MAIN_LOG, LOG_INFO, "Skipping language entry '%s' (unable to stat).", dirent->d_name);
continue;
log_module(MAIN_LOG, LOG_INFO, "Skipping language entry '%s' (not directory).", dirent->d_name);
continue;
}
- language_alloc(dirent->d_name);
+ if (!dict_find(languages, dirent->d_name, NULL))
+ language_alloc(dirent->d_name);
}
closedir(dir);
}
if (irc_send)
{} /* use that function */
- else if (hi)
+ else if(IsChannelName(to)) {
+ irc_send = irc_privmsg;
+ }
+ else if (message_dest->no_notice) {
+ irc_send = irc_privmsg;
+ }
+ else if (hi) {
irc_send = HANDLE_FLAGGED(hi, USE_PRIVMSG) ? irc_privmsg : irc_notice;
- else
- irc_send = IsChannelName(to) ? irc_privmsg : irc_notice;
+ }
+ else {
+ irc_send = irc_notice;
+ }
/* Limit size to how much we can show at once */
if (size > sizeof(line))
/* Send the table. */
for (jj=0, pos=0, reps=0; ii<table.length; ) {
while (1) {
+ int PAD_COL_LEFT = false;
+ if(table.flags & TABLE_PAD_LEFT || str_is_number(table.contents[ii][jj]))
+ PAD_COL_LEFT = true;
len = strlen(table.contents[ii][jj]);
spaces = max_width[jj] - len;
- if (table.flags & TABLE_PAD_LEFT)
+ //if (table.flags & TABLE_PAD_LEFT)
+ if(PAD_COL_LEFT)
while (spaces--) line[pos++] = ' ';
memcpy(line+pos, table.contents[ii][jj], len);
pos += len;
break;
}
}
- if (!(table.flags & TABLE_PAD_LEFT))
+ //if (!(table.flags & TABLE_PAD_LEFT))
+ if(!PAD_COL_LEFT)
while (spaces--)
line[pos++] = ' ';
line[pos++] = ' ';
!(table.flags & TABLE_NO_FOOTER) &&
!(hi && hi->userlist_style == HI_STYLE_CLEAN)) {
char endstr[MAX_LINE_SIZE+1];
- sprintf(endstr, "End (%d rows)", table.length);
+ sprintf(endstr, "End (%d rows)", table.length-1);
/* Copy above into the sepstr, centered */
if(sepsize > strlen(endstr)+2)
unsigned int size, ipos, pos, length, chars_sent, use_color;
unsigned int expand_pos, expand_ipos, newline_ipos;
char line[MAX_LINE_SIZE];
+ struct service *service;
+ static char* trigger = NULL;
if (IsChannelName(dest) || *dest == '$') {
message_dest = NULL;
size = DEFAULT_LINE_SIZE;
switch (msg_type & 3) {
case 0:
- irc_send = irc_notice;
+ if(message_dest && message_dest->no_notice)
+ irc_send = irc_privmsg;
+ else
+ irc_send = irc_notice;
break;
case 2:
irc_send = irc_wallchops;
expand_pos = pos = 0;
chars_sent = 0;
while (input.list[ipos]) {
- char ch, *value, *free_value;
+ char ch, *value = NULL, *free_value;
while ((ch = input.list[ipos]) && (ch != '$') && (ch != '\n') && (pos < size)) {
line[pos++] = ch;
case 'b':
value = use_color ? "\002" : "";
break;
+ case 'k':
+ value = use_color ? "\003" : "";
+ break;
case 'o':
value = use_color ? "\017" : "";
break;
case 's':
value = self->name;
break;
+#ifdef HAVE_HELPSERV
+ case 'i':
+ value = strdup(get_helpserv_id(dest, src));
+ break;
+#endif
case 'H':
value = handle ? handle->handle : "Account";
break;
+ case '!': /* Command Char for chanserv */
+ if(!trigger)
+ trigger = calloc(sizeof(*trigger), 2);
+ if(chanserv && (service = service_find(chanserv->nick)))
+ trigger[0] = service->trigger;
+ else
+ trigger[0] = '!';
+ value = trigger;
+ break;
#define SEND_LINE(TRUNCED) do { \
line[pos] = 0; \
if (pos > 0) { \
break;
default:
value = "";
- log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, expand_f);
+ log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, (void*)expand_f);
break;
}
ipos = name_end - input.list;
int res;
va_list ap;
- if (IsLocal(dest)) return 0;
+ if (IsLocal(dest) && !IsDummy(dest)) return 0;
va_start(ap, format);
res = vsend_message(dest->nick, src, dest->handle_info, 0, NULL, format, ap);
va_end(ap);
int res;
va_list ap;
- if (IsLocal(dest)) return 0;
+ if (IsLocal(dest) && !IsDummy(dest)) return 0;
va_start(ap, format);
res = vsend_message(dest->nick, src, dest->handle_info, msg_type, NULL, format, ap);
va_end(ap);
language_read_list();
}
-void helpfile_finalize(void)
+static void helpfile_read_languages(void)
{
dict_iterator_t it;
+ dict_t dict;
+
+ language_read_list();
for (it = dict_first(languages); it; it = iter_next(it))
language_read(iter_key(it));
- reg_exit_func(language_cleanup);
+
+ /* If the user has a strings.db in their languages directory,
+ * allow that to override C language strings.
+ */
+ dict = parse_database("languages/strings.db");
+ if (dict) {
+ language_set_messages(lang_C, dict);
+ free_database(dict);
+ }
+}
+
+void helpfile_finalize(void)
+{
+ conf_register_reload(helpfile_read_languages);
+ reg_exit_func(language_cleanup, NULL);
}
projects / irc / evilnet / x3.git / blobdiff