packages: phorum/phorum.spec, phorum/translate-macros.patch (NEW) - start m...

[glen]

Author: glen                         Date: Thu Oct 21 21:38:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- start macro uses in translations

---- Files affected:
packages/phorum:
   phorum.spec (1.62 -> 1.63) , translate-macros.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.62 packages/phorum/phorum.spec:1.63
--- packages/phorum/phorum.spec:1.62	Fri Oct  1 09:38:10 2010
+++ packages/phorum/phorum.spec	Thu Oct 21 23:38:39 2010
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Phorum - implementacja forum WWW w PHP
 Name:		phorum
 Version:	%{mainver}.15a
-Release:	2
+Release:	2.2
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 Patch7:		update-et.patch
 Patch8:		update-ru.patch
 Patch9:		multibyte_description.patch
+Patch10:	translate-macros.patch
 URL:		http://www.phorum.org/
 BuildRequires:	iconv
 BuildRequires:	rpm-php-pearprov
@@ -332,6 +333,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -608,6 +610,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2010/10/21 21:38:39  glen
+- start macro uses in translations
+
 Revision 1.62  2010/10/01 07:38:10  glen
 - update et translations
 

================================================================
Index: packages/phorum/translate-macros.patch
diff -u /dev/null packages/phorum/translate-macros.patch:1.1
--- /dev/null	Thu Oct 21 23:38:45 2010
+++ packages/phorum/translate-macros.patch	Thu Oct 21 23:38:39 2010
@@ -0,0 +1,23 @@
+add new macros, to avoid using language constructs in translations.
+
+- $PHORUM['file_space_quota'] -> %file_space_quota%
+
+still todo:
+- $PHORUM[title] -> %phorum_title%
+- $PHORUM['max_file_size'] -> %max_file_size%
+- phorum_get_url(PHORUM_LOGIN_URL) -> %login_url%
+
+--- ../BUILD/phorum-5.2.15a/include/api/file.php	2010-10-22 00:35:13.428590924 +0300
++++ /usr/share/phorum/include/api/file.php	2010-10-22 00:34:39.120486837 +0300
+@@ -212,9 +212,10 @@
+             $sz = phorum_db_get_user_filesize_total($PHORUM["user"]["user_id"]);
+             $sz += $file["filesize"];
+             if ($sz > $PHORUM["file_space_quota"]*1024) {
++                $msg = str_replace("%file_space_quota%", $PHORUM['file_space_quota'], $PHORUM["DATA"]["LANG"]["FileOverQuota"]);
+                 return phorum_api_error_set(
+                     PHORUM_ERRNO_NOACCESS,
+-                    $PHORUM["DATA"]["LANG"]["FileOverQuota"]
++                    $msg,
+                 );
+             }
+         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.62&r2=1.63&f=u