- lpgen.js fixed bug with cutting strings, which are ended with '). Now more correct RegExp with \1 using. When string starts with (" than match end as "), not ').

- english templates updated with new lpgen.js

git-svn-id: http://svn.miranda-ng.org/main/trunk@3377 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 15 insertions, 16 deletions

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 2ff802d83c..65e2982527 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -342,7 +342,7 @@
 [Contact List smileys]

 [Do You want contact '%s' to be converted to MetaContact and '%s' be added to it?]

 [Converting to MetaContact]

-[Do You want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s]

+[Do You want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?]

 [Converting to MetaContact (Moving)]

 [Do you want to contact '%s' be added to metacontact '%s'?]

 [Adding contact to MetaContact]

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 7e0a6db004..5e1cb8cc2f 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -42,16 +42,16 @@
 [Wrong number of parameters for command '%s'.]

 [Unknown parameter '%s' for command '%s'.]

 [Current global status: %s.%s]

-[Changed global status to '%s' (previous status was '%s]

-[Changed '%s' status to '%s' (previous status was '%s]

+[Changed global status to '%s' (previous status was '%s').]

+[Changed '%s' status to '%s' (previous status was '%s').]

 ['%s' doesn't seem to be a valid account.]

 [Failed to change status for account '%s' to '%s'.]

-[Failed to set '%S' status message to '%s' (status is '%s]

-[Successfully set '%S' status message to '%s' (status is '%s]

+[Failed to set '%S' status message to '%s' (status is '%s').]

+[Successfully set '%S' status message to '%s' (status is '%s').]

 [Account '%S' does not support away messages, skipping.]

-[Changed '%s' status message to '%s' (status is '%s]

+[Changed '%s' status message to '%s' (status is '%s').]

 [Account '%s' does not support away messages, skipping.]

-[Failed to change status message for account '%s' to '%s' (status is '%s]

+[Failed to change status message for account '%s' to '%s' (status is '%s').]

 [Issued check email command to Exchange plugin.]

 [Exchange plugin is not running.]

 [Issued check email command to YAMN plugin.]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 52bc487d88..299f7f76dd 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -339,7 +339,7 @@
 [Can report information about the music to which a user is listening]

 [Receives information about the music to which a user is listening]

 [Supports private XML Storage (for bookmakrs and other)]

-[Supports attention requests ('nudge]

+[Supports attention requests ('nudge')]

 [Supports chat history retrieving]

 [Supports chat history management]

 [Can report information about user activity]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 2cfb5db474..808b7e9ab7 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -140,7 +140,7 @@
 [Key length must be of length from 1024 to 4096 bits]

 [Invalid date]

 [Name must contain at least 5 characters]

-[Name cannot contain '(' or ]

+[Name cannot contain '(' or ')']

 [Invalid Email]

 [Generating new key, please wait...]

 [Expiration date]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index f8b8cf64de..76f753dbbd 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -198,8 +198,7 @@
 [KPA]

 [HPA]

 [TORR]

-["\r\nvoid GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str) \r\n{\r\n	// unit can be km/h, mph, m/s, knots\r\n	double tempunit;\r\n	TCHAR tstr[20];\r\n\r\n	str[0] = 0;\r\n\r\n	// convert the string into an integer (always positive)\r\n	// if the result is 0, then the string is not a number, return _T(""\r\n	tempunit = _ttof(tempchar);\r\n	if (tempunit == 0 && tempchar[0] != '0]

-[KM/H]

+["\r\nvoid GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str) \r\n{\r\n	// unit can be km/h, mph, m/s, knots\r\n	double tempunit;\r\n	TCHAR tstr[20];\r\n\r\n	str[0] = 0;\r\n\r\n	// convert the string into an integer (always positive)\r\n	// if the result is 0, then the string is not a number, return _T(""\r\n	tempunit = _ttof(tempchar);\r\n	if (tempunit == 0 && tempchar[0] != '0')\r\n		return;\r\n\r\n	// convert all to m/s first\r\n	if ( !_tcsicmp(unit, _T("KM/H]

 [M/S]

 [MPH]

 [KNOTS]

@@ -240,7 +239,7 @@
 [wintry]

 [drizzle]

 [rain]

-[%20"\r\n// dis = original string\r\n// return value = the modified string with space -> _T("%20"\r\nchar *GetSearchStr(char *dis) \r\n{\r\n	char *pstr = dis;\r\n	size_t len = strlen(dis);\r\n	while (*pstr != 0)\r\n	{\r\n		if (*pstr == ' ]

+[%20"\r\n// dis = original string\r\n// return value = the modified string with space -> _T("%20"\r\nchar *GetSearchStr(char *dis) \r\n{\r\n	char *pstr = dis;\r\n	size_t len = strlen(dis);\r\n	while (*pstr != 0)\r\n	{\r\n		if (*pstr == ' ')\r\n		{\r\n			memmove(pstr+3, pstr+1, len);\r\n			memcpy(pstr, _T("%20]

 [<unknown time>]

 [<Error>]

 [HTTP Error %i]

@@ -250,6 +249,7 @@
 [Low]

 [Feel]

 [Wind Speed]

+[KM/H]

 [COND]

 [DEG]

 [DAY]

diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js
index 8a346e211b..d4d6463ead 100644
--- a/tools/lpgen/lpgen.js
+++ b/tools/lpgen/lpgen.js
@@ -446,9 +446,8 @@ function ParseSourceFile (SourceFile,array) {
  if (FSO.GetFile(SourceFile).Size==0) return;

  //open file

  sourcefile_stream=FSO.GetFile(SourceFile).OpenAsTextStream(ForReading, TristateUseDefault);

- //this is final great regexp ever /(?:LPGENT?|Translate[TW]?|_T)(?:[\s])*?(?:\(['"])([\S\s]*?)(?=["']\x20*?\))/mg

- //not store ?: functions LPGEN or LPGENT? or Translate(T or W) or _T, than any unnecessary space \s, than not stored ?: "(" followed by ' or " than \S\s - magic with multiline capture, ending with not stored ?= " or ', than none or few spaces \x20 followed by )/m=multiline g=global

- var find= /(?:LPGENT?|Translate[TW]?|_T)(?:[\s])*?(?:\(['"])([\S\s]*?)(?=["'],?\x20*?(?:tmp)?\))/mg;

+ //not store ?: functions LPGEN or LPGENT? or Translate(T or W) or _T, than any unnecessary space \s, than not stored ?: "(" followed by ' or " (stored and used as \1) than \S\s - magic with multiline capture, ending with not stored ?= \1 (we get " or ' after "("), than none or few spaces \x20 followed by )/m=multiline g=global

+ var find= /(?:LPGENT?|Translate[TW]?|_T)(?:\s*?\()(['"])([\S\s]*?)(?=\1,?\x20*?(?:tmp)?\))/mg;

  //comment previous line and uncomment following line to output templates without _T() function in source files. Too many garbage from _T()..

  //var find= /(?:LPGENT?|Translate[TW]?)(?:[\s])*?(?:\(['"])([\S\s]*?)(?=["'],?\x20*?(?:tmp)?\))/mg;

  

@@ -459,7 +458,7 @@ function ParseSourceFile (SourceFile,array) {
     //first, init empty var

     var string;

     //replace newlines with \r\n in second [1] subregexp ([\S\s]*?), Delphi newlines "'#13#10+" also replace 

-    onestring=string[1].replace(/'?(\#13\#10)*?\+?\r\n(\x20*?\')?/g,"\\r\\n");

+    onestring=string[2].replace(/'?(\#13\#10)*?\+?\r\n(\x20*?\')?/g,"\\r\\n");

     //remove escape slashes before ' and "

     stringtolangpack=onestring.replace(/\\(['"])/g,"$1");

     //if our string still exist, and length more than 2 symbol (nothing to translate if only two symbols, well, except No and OK, but they are in core. But dozens crap with variables are filtered)