From d3ba377982adb2fb5410445049aa39a0467eba11 Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 21 Apr 2013 09:27:27 +0000 Subject: - Remove current msg locale implementation git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1837 82007160-df01-0410-b94d-b575c5fd34c7 --- Makefile.am | 2 +- Makefile.in | 2 +- configure | 5 +- configure.ac | 1 - doc/index.txt | 2 - doc/messages.txt | 54 - doc/modes.txt | 2 +- doc/reference.conf | 8 - help/opers/set | 3 - include/numeric.h | 210 +-- messages/Makefile.am | 21 - messages/Makefile.in | 495 ----- messages/README | 45 - messages/ayb.lang | 29 - messages/custom.lang | 20 - messages/ircd-brazilian_pt.lang | 127 -- messages/ircd-bulgarian.lang | 99 - messages/ircd-croatian.lang | 94 - messages/ircd-danish.lang | 93 - messages/ircd-dutch.lang | 123 -- messages/ircd-french.lang | 112 -- messages/ircd-german.lang | 126 -- messages/ircd-italian.lang | 127 -- messages/ircd-norwegian.lang | 90 - messages/ircd-polish.lang | 108 -- messages/ircd-romanian.lang | 126 -- messages/ircd-russian.lang | 93 - messages/ircd-spanish.lang | 97 - messages/ircd-standard.example.lang | 137 -- messages/ircd-swedish.lang | 108 -- modules/m_set.c | 18 - src/conf_lexer.c | 2535 +++++++++++++------------ src/conf_lexer.l | 1 - src/conf_parser.c | 3486 +++++++++++++++++------------------ src/conf_parser.h | 548 +++--- src/conf_parser.y | 13 - src/messages.tab | 1029 ----------- src/numeric.c | 1197 ++++++++++-- 38 files changed, 4284 insertions(+), 7102 deletions(-) delete mode 100644 doc/messages.txt delete mode 100644 messages/Makefile.am delete mode 100644 messages/Makefile.in delete mode 100644 messages/README delete mode 100644 messages/ayb.lang delete mode 100644 messages/custom.lang delete mode 100644 messages/ircd-brazilian_pt.lang delete mode 100644 messages/ircd-bulgarian.lang delete mode 100644 messages/ircd-croatian.lang delete mode 100644 messages/ircd-danish.lang delete mode 100644 messages/ircd-dutch.lang delete mode 100644 messages/ircd-french.lang delete mode 100644 messages/ircd-german.lang delete mode 100644 messages/ircd-italian.lang delete mode 100644 messages/ircd-norwegian.lang delete mode 100644 messages/ircd-polish.lang delete mode 100644 messages/ircd-romanian.lang delete mode 100644 messages/ircd-russian.lang delete mode 100644 messages/ircd-spanish.lang delete mode 100644 messages/ircd-standard.example.lang delete mode 100644 messages/ircd-swedish.lang delete mode 100644 src/messages.tab diff --git a/Makefile.am b/Makefile.am index 0fcd28f..14eeb75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = tools libltdl doc help messages modules src +SUBDIRS = tools libltdl doc help modules src install-data-local: $(INSTALL) -d $(DESTDIR)${localstatedir}/log diff --git a/Makefile.in b/Makefile.in index 45cf067..9f677f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -307,7 +307,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = tools libltdl doc help messages modules src +SUBDIRS = tools libltdl doc help modules src all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/configure b/configure index 8ec9777..d6098c3 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 1751 2013-01-16 18:30:52Z michael . +# From configure.ac Id: configure.ac 1834 2013-04-19 19:50:27Z michael . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for ircd-hybrid TRUNK. # @@ -14443,7 +14443,7 @@ _ACEOF test "$exec_prefix_NONE" && exec_prefix=NONE -ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile messages/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile help/opers/Makefile help/users/Makefile tools/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile help/opers/Makefile help/users/Makefile tools/Makefile" cat >confcache <<\_ACEOF @@ -15488,7 +15488,6 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;; - "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;; "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; diff --git a/configure.ac b/configure.ac index fdec15c..8efde04 100644 --- a/configure.ac +++ b/configure.ac @@ -175,7 +175,6 @@ AC_CONFIG_FILES( \ Makefile \ src/Makefile \ libltdl/Makefile \ - messages/Makefile \ modules/Makefile \ modules/core/Makefile \ doc/Makefile \ diff --git a/doc/index.txt b/doc/index.txt index d43a112..e086941 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -13,8 +13,6 @@ ircd.8 - The new revised manpage, read with the following man -M . ircd kline.txt - Outline of the remote K-line protocol for both opers and servers -messages.txt - A general help file for users and admins to - customize ircd's messages. modeg.txt - An in depth description of the server side silence user mode (+g) modes.txt - A list of all user and channel modes diff --git a/doc/messages.txt b/doc/messages.txt deleted file mode 100644 index 06fc967..0000000 --- a/doc/messages.txt +++ /dev/null @@ -1,54 +0,0 @@ - Message Customization Overview - - $Id$ - - Copyright (c) 2005-2012 by ircd-hybrid team - - ---------------------------------------------------------------------- - - Hybrid now supports its own .lang format for i18n'd IRC status messages. - - This document is split into two parts, using message files, and creating - your own. - - ---------------------------------------------------------------------- - - Using Provided or Pre-made Message Files - - There are a number of message files provided with ircd-hybrid. These can - be found in the source tree in messages/. - - These files are automatically installed by `make install'. - - These message files can be used in ircd once they are installed. Try the - installed message file with /quote SET MSGLOCALE first. The - locale will be 'standard' for the plain messages that are Hybrid's - default. - - If the desired message file works without any issues, it can be set to be - the default message file in the ircd.conf file. Refer to reference.conf's - documentation on the message_locale setting. - - ---------------------------------------------------------------------- - - Creating Your Own Messages - - This process is a little more complicated. The easiest way to start - editing messages is to take ircd-standard.example.lang, make a copy, - and change whichever status lines you wish. - - Once you have your customized message file ready, just copy it into the - same place as the rest of the messages, typically $PREFIX/messages. - - If you think your .lang file deserves to be in the official distribution, - submit it to us at bugs@ircd-hybrid.org. It must be complete and as error- - free as you can make it since it is subject to public consumption. Providing - a translation will be a way that nearly anyone who knows multiple languages - to contribute to ircd, and get their name in the translation credits. - - When making such a translation, you should base it off - ircd-standard.example.lang, which is a conversion of our base (English) - messages.tab into the .lang format. You should edit it from there into your - own language, and of course give credit to yourself and whoever else you - may have done the translation with. Then, send it off to us, and we'll see - what we can do. diff --git a/doc/modes.txt b/doc/modes.txt index 906aa57..6902948 100644 --- a/doc/modes.txt +++ b/doc/modes.txt @@ -6,7 +6,7 @@ In /VERSION one might see something like this: irc.corefailure.com hybrid-7beta5 oiwszcerkfydnxbaugl biklmnopstveIh bkloveIh These describe the user modes, channel modes, and channel modes that require -arguments that are available to the user. It is hardcoded into src/messages.tab. +arguments that are available to the user. It is hardcoded into src/numeric.c Here is a guide to the preceding modes: diff --git a/doc/reference.conf b/doc/reference.conf index 3269694..918193a 100644 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -1111,14 +1111,6 @@ general { */ max_targets = 4; - /* - * message_locale: the default message locale - * Use "standard" for the compiled in defaults. - * To install the translated messages, go into messages/ in the - * source directory and run `make install'. - */ - message_locale = "standard"; - /* * usermodes configurable: a list of usermodes for the options below * diff --git a/help/opers/set b/help/opers/set index a6bd083..6104ac6 100644 --- a/help/opers/set +++ b/help/opers/set @@ -15,9 +15,6 @@ SET