[debian-edu-commits] debian-edu/slbackup-php.git (#4) - edu-wheezy (branch) updated: upstream/0.4.1
Mike Gabriel
sunweaver at alioth.debian.org
Fri Aug 9 10:05:48 UTC 2013
The branch, edu-wheezy has been updated
via 90d69abfb1bc6695aeb329c436614743234cebd9 (commit)
from 076f534078306927b96a59f21e2d88af90b16ea0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++
Makefile | 6 +-
debian/changelog | 13 +++
debian/control | 2 +-
debian/po/cs.po | 2 +-
debian/po/da.po | 2 +-
debian/po/de.po | 2 +-
debian/po/es.po | 2 +-
debian/po/eu.po | 2 +-
debian/po/fi.po | 2 +-
debian/po/fr.po | 6 +-
debian/po/gl.po | 2 +-
debian/po/ja.po | 2 +-
debian/po/nl.po | 2 +-
debian/po/pt.po | 2 +-
debian/po/ru.po | 6 +-
debian/po/sv.po | 299 +++++------------------------------------------
debian/po/vi.po | 2 +-
src/index.php | 2 -
src/smarty3-gettext.php | 127 --------------------
20 files changed, 71 insertions(+), 420 deletions(-)
delete mode 100644 src/smarty3-gettext.php
The diff of changes is:
diff --git a/ChangeLog b/ChangeLog
index 82b1046..f9c8ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun, 08 Jul 2012 Mike Gabriel
+
+ * Release 0.4.1:
+ - Stop shipping smarty-gettext-like code.
+ - Do not update .po files on normal build/install.
+ - po/sv.po got lost, re-created the file from an earlier version.
+ * Drop smarty-gettext build-dependency.
+
Sun, 01 Jul 2012 Mike Gabriel
* Release 0.4.0:
diff --git a/Makefile b/Makefile
index e9a264d..904dc3d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,7 @@ PACKAGE = slbackup-php
LIBS= \
index.php \
sl-style.css \
- functions.php \
- smarty3-gettext.php
+ functions.php
SCRIPTS= \
mypass.sh
@@ -40,7 +39,7 @@ po/*.po: po/slbackup-php.pot
cp $@ $@.bak ; \
msgmerge $@.bak $^ > $@
-locales/mo-stamp: po/*.po
+locales/mo-stamp:
for po in $^ ; do \
locale=$$(basename $$po .po) ; \
echo $$locale ; \
@@ -56,6 +55,7 @@ po/slbackup-php.pot: src/*.php templates/*.tpl
xgettext --add-comments --language=PHP --default-domain=slbackup-php \
- src/*.php --output po/slbackup-php.pot
+po-files: po/*.po
install: all
install -d $(DESTDIR)$(sharedir)
diff --git a/debian/changelog b/debian/changelog
index 359608d..d98c1dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+slbackup-php (0.4.1-0) unstable; urgency=low
+
+ * New upstream version (0.4.1):
+ - Drop smarty-gettext code, use the plugin provided in Debian or other
+ distro.
+ - Do not recreate .po files during make mo-files. Provide po-files stanza
+ in Makefile for recreating .po files manually.
+ * /debian/po/svn.po:
+ + Replace sv.po for php GUI translations with svn.po for debconf template
+ translations.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 08 Jul 2012 16:31:52 +0200
+
slbackup-php (0.4.0-0) unstable; urgency=low
[ Mike Gabriel ]
diff --git a/debian/control b/debian/control
index 734ab9d..2a69238 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5), po-debconf, smarty-gettext, php5-cli, quilt (>=
Package: slbackup-php
Architecture: all
-Depends: ${misc:Depends}, libapache2-mod-php5, apache2, smarty3, ssh, php5-cli
+Depends: ${misc:Depends}, libapache2-mod-php5, apache2, smarty3, ssh, php5-cli, smarty-gettext
Description: web-based administration tool for slbackup
Slbackup-php provides the necessary functions to maintain a slbackup
repository.
diff --git a/debian/po/cs.po b/debian/po/cs.po
index ed65e33..f09d1d2 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-25 09:16+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
#. Type: boolean
#. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index 8b8a4ee..94416fc 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2010-05-10 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
#. Type: boolean
#. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 84ea323..0d2a15d 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-24 19:55+0200\n"
"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
#. Type: boolean
#. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index 9f8db34..50f45e2 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -35,10 +35,10 @@ msgstr ""
"PO-Revision-Date: 2010-04-07 10:36+0200\n"
"Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
#. Type: boolean
#. Description
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 7b1dd67..2fd698b 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-25 11:00+0200\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>, 2007\n"
"Language-Team: Euskara <Librezale at librezale.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
#. Type: boolean
#. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 6e36b29..afbaa65 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -6,10 +6,10 @@ msgstr ""
"PO-Revision-Date: 2008-03-01 22:35+0200\n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 8dc7739..66410cf 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-30 11:30+0200\n"
"Last-Translator: Hugues Naulet <hnaulet at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
#. Type: boolean
#. Description
@@ -29,8 +29,8 @@ msgid ""
"Please note that SSL is needed to connect to the slbackup-php server. "
"Activating it is therefore strongly recommended."
msgstr ""
-"Veuillez noter que SSL est nécessaire pour se connecter au serveur « slbackup-"
-"php ».Son activation est donc fortement recommandée."
+"Veuillez noter que SSL est nécessaire pour se connecter au serveur « "
+"slbackup-php ».Son activation est donc fortement recommandée."
#. Type: boolean
#. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 5b726ae..56d3a1c 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-25 00:41+0200\n"
"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
#. Type: boolean
#. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 8cd8eef..4126f5d 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2009-10-25 06:52+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
#. Type: boolean
#. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 74fbe26..ed8bb41 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-10-26 13:30+0100\n"
"Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Poedit-Language: Dutch\n"
#. Type: boolean
diff --git a/debian/po/pt.po b/debian/po/pt.po
index c0129d4..7f0404d 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-25 09:20+0000\n"
"Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
#. Type: boolean
#. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 4b3dcac..b446461 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -11,13 +11,13 @@ msgstr ""
"PO-Revision-Date: 2007-07-01 19:18+0400\n"
"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. Type: boolean
#. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 962b470..dca18c2 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -6,279 +6,38 @@
msgid ""
msgstr ""
"Project-Id-Version: slbackup-php\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-25 10:31+0200\n"
-"PO-Revision-Date: 2007-05-22 00:22+0100\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-24 15:22+0200\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. templates/maint.tpl
-#. templates/header.tpl
-#: standard input:2
-#: standard input:26
-msgid "Maintenance"
-msgstr "Underhåll"
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Aktivera SSL-stöd i slbackup-php?"
-#. templates/maint.tpl
-#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:5
-#: standard input:74
-#: standard input:110
-msgid "Choose"
-msgstr "Välj"
-
-#. templates/maint.tpl
-#: standard input:8
-msgid "Oldest snapshot to keep:"
-msgstr "Äldsta ögonblicksbild att spara:"
-
-#. templates/maint.tpl
-#: standard input:11
-msgid "Delete older"
-msgstr "Ta bort äldre"
-
-#. templates/header.tpl
-#: standard input:14
-msgid "SLBackup Configuration"
-msgstr "Konfiguration av SLBackup"
-
-#. templates/header.tpl
-#: standard input:17
-msgid "Status"
-msgstr "Status"
-
-#. templates/header.tpl
-#: standard input:20
-msgid "Config"
-msgstr "Konfiguration"
-
-#. templates/header.tpl
-#: standard input:23
-msgid "Restore"
-msgstr "Återskapa"
-
-#. templates/header.tpl
-#: standard input:29
-msgid "Logout"
-msgstr "Logga ut"
-
-#. templates/config.tpl
-#: standard input:32
-msgid "Server scheduler"
-msgstr "Schemaläggare"
-
-#. templates/config.tpl
-#: standard input:35
-msgid "Backup enabled"
-msgstr "Säkerhetskopiering aktiverad"
-
-#. templates/config.tpl
-#: standard input:38
-msgid "Run backup at"
-msgstr "Kör säkerhetskopiering klockan"
-
-#. templates/config.tpl
-#: standard input:41
-#: standard input:62
-#: src/index.php:924
-msgid "Update"
-msgstr "Uppdatera"
-
-#. templates/config.tpl
-#. templates/login.tpl
-#: standard input:44
-#: standard input:65
-#: standard input:95
-#: standard input:170
-msgid "Reset"
-msgstr "Nollställ"
-
-#. templates/config.tpl
-#: standard input:47
-msgid "Server config"
-msgstr "Serverkonfiguration"
-
-#. templates/config.tpl
-#: standard input:50
-#: standard input:83
-msgid "Address"
-msgstr "Adress"
-
-#. templates/config.tpl
-#: standard input:53
-msgid "Destdir"
-msgstr "Målkatalog"
-
-#. templates/config.tpl
-#: standard input:56
-msgid "Servertype"
-msgstr "Servertyp"
-
-#. templates/config.tpl
-#: standard input:59
-#: standard input:92
-msgid "User"
-msgstr "Användare"
-
-#. templates/config.tpl
-#: standard input:68
-msgid "Client config"
-msgstr "Klientkonfiguration"
-
-#. templates/config.tpl
-#: standard input:71
-msgid "Client:"
-msgstr "Klient:"
-
-#. templates/config.tpl
-#: standard input:77
-msgid "New"
-msgstr "Ny"
-
-#. templates/config.tpl
-#: standard input:80
-msgid "Remove"
-msgstr "Ta bort"
-
-#. templates/config.tpl
-#: standard input:86
-msgid "Backup Age"
-msgstr "Ålder för säkerhetskopior"
-
-#. templates/config.tpl
-#: standard input:89
-msgid "Clienttype"
-msgstr "Klienttyp"
-
-#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:98
-#: standard input:113
-msgid "Locations:"
-msgstr "Platser:"
-
-#. templates/config.tpl
-#: standard input:101
-#: src/index.php:922
-msgid "Add"
-msgstr "Lägg till"
-
-#. templates/config.tpl
-#: standard input:104
-msgid "Delete"
-msgstr "Ta bort"
-
-#. templates/restore.tpl
-#: standard input:107
-msgid "Client to restore"
-msgstr "Klient att återskapa"
-
-#. templates/restore.tpl
-#: standard input:116
-msgid "Browse"
-msgstr "Bläddra"
-
-#. templates/restore.tpl
-#: standard input:119
-msgid "Restore of %1"
-msgstr "Återskapandet av %1"
-
-#. templates/restore.tpl
-#: standard input:122
-msgid "Deleted"
-msgstr "Borttaget"
-
-#. templates/status.tpl
-#: standard input:125
-msgid "Clients"
-msgstr "Klienter"
-
-#. templates/status.tpl
-#: standard input:128
-msgid "OK at %1"
-msgstr "OK %1"
-
-#. templates/status.tpl
-#: standard input:131
-msgid "Failed at %1"
-msgstr "Misslyckades %1"
-
-#. templates/status.tpl
-#: standard input:134
-msgid "Client never backed up"
-msgstr "Klienten har aldrig säkerhetskopierats"
-
-#. templates/status.tpl
-#: standard input:137
-msgid "ssh-keys are working"
-msgstr "ssh-nycklarna är rätt konfigurerade"
-
-#. templates/status.tpl
-#: standard input:140
-msgid "rdiff-backup-versions differ"
-msgstr "rdiff-backup-versionerna stämmer inte överens"
-
-#. templates/status.tpl
-#: standard input:143
-msgid "ssh-keys are not working"
-msgstr "ssh-nycklarna är felkonfigurerade"
-
-#. templates/status.tpl
-#: standard input:146
-msgid "Backup status"
-msgstr "Status för säkerhetskopiering"
-
-#. templates/status.tpl
-#: standard input:149
-msgid "Backup last finished at %1"
-msgstr "Säkerhetskopieringen färdigställdes %1"
-
-#. templates/status.tpl
-#: standard input:152
-msgid "A new backup started at %1"
-msgstr "En ny säkerhetskopiering startades %1"
-
-#. templates/login.tpl
-#: standard input:155
-msgid "To read the configuration, you must log in as %1 on %2."
-msgstr "För att läsa konfiguration måste du logga in som %1 på %2."
-
-#. templates/login.tpl
-#: standard input:158
-msgid "Please enter the password for the %1 account on %2:"
-msgstr "Ange lösenordet för %1-kontot på %2:"
-
-#. templates/login.tpl
-#: standard input:161
-msgid "WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable https"
-msgstr "VARNING: du är på väg att skicka ditt lösenord över en okrypterad förbindelse, be din administratör att aktivera https"
-
-#. templates/login.tpl
-#: standard input:164
-msgid "Login to this application is denied without the use of https. Please ask your administrator to enable https"
-msgstr "Inloggning till det här programmet nekas därför att https inte används. Be din administratör att aktivera https"
-
-#. templates/login.tpl
-#: standard input:167
-msgid "Login"
-msgstr "Logga in"
-
-#: src/index.php:735
-#, php-format
-msgid "No client specified :("
-msgstr "Ingen klient angiven :("
-
-#: src/index.php:740
-#, php-format
-msgid "Unable to find %s in the list of clients."
-msgstr "Kunde inte hitta %s i listan över klienter."
-
-#: src/index.php:774
-#, php-format
-msgid "Unable to find %s in the locations of %s."
-msgstr "Kunde inte hitta %s i platserna för %s."
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Observera att SSL behövs för att ansluta till slbackup-php-servern. Det "
+"rekommenderas därför att det aktiveras."
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Dock bör även SSL aktiveras i webbservern vilket inte kommer att genomföras "
+"genom att välja det här alternativet."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index e7bd9f4..aa107c7 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-06-25 21:32+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
+"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.6.4a3\n"
diff --git a/src/index.php b/src/index.php
index 41b4e8a..c337711 100644
--- a/src/index.php
+++ b/src/index.php
@@ -582,7 +582,6 @@ global $backuphost, $backupuser, $logfile, $ssh_options, $ssh_askpass ;
}
require_once ('functions.php') ;
-require_once ('smarty3-gettext.php') ;
loadConfig () ;
require('/usr/share/php/smarty3/Smarty.class.php') ;
session_start() ;
@@ -594,7 +593,6 @@ $smarty->template_dir = $smarty_templ ;
$smarty->compile_dir = $smarty_compile ;
unset ($_COOKIE['smarty_templ']);
unset ($_COOKIE['smarty_compile']);
-$smarty->register->block('t', 'smarty_block_t');
# fetch script to use whith passing the ssh-password
$ssh_askpass = sprintf ("%s/script/mypass.sh",
diff --git a/src/smarty3-gettext.php b/src/smarty3-gettext.php
deleted file mode 100644
index 492396e..0000000
--- a/src/smarty3-gettext.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * smarty3-gettext.php - Smarty gettext block plugin
- *
- * ------------------------------------------------------------------------- *
- * This library is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU Lesser General Public *
- * License as published by the Free Software Foundation; either *
- * version 2.1 of the License, or (at your option) any later version. *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library; if not, write to the Free Software *
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
- * ------------------------------------------------------------------------- *
- *
- * Installation: simply copy this file to the smarty plugins directory and
- * rename to block.t.php
- *
- * @package smarty3-gettext
- * @version $Id: block.t.php,v 1.1 2005/07/27 17:58:56 sagi Exp $
- * @link http://smarty-gettext.sourceforge.net/
- * @author Sagi Bashari <sagi at boom.org.il>
- * @copyright 2004-2005 Sagi Bashari
- */
-
-/**
- * Replaces arguments in a string with their values.
- * Arguments are represented by % followed by their number.
- *
- * @param string Source string
- * @param mixed Arguments, can be passed in an array or through single variables.
- * @returns string Modified string
- */
-function smarty_gettext_strarg($str)
- {
- $tr = array();
- $p = 0;
-
- for ($i=1; $i < func_num_args(); $i++) {
- $arg = func_get_arg($i);
-
- if (is_array($arg)) {
- foreach ($arg as $aarg) {
- $tr['%'.++$p] = $aarg;
- }
- } else {
- $tr['%'.++$p] = $arg;
- }
- }
-
- return strtr($str, $tr);
-}
-
-/**
- * Smarty block function, provides gettext support for smarty.
- *
- * The block content is the text that should be translated.
- *
- * Any parameter that is sent to the function will be represented as %n in the translation text,
- * where n is 1 for the first parameter. The following parameters are reserved:
- * - escape - sets escape mode:
- * - 'html' for HTML escaping, this is the default.
- * - 'js' for javascript escaping.
- * - 'url' for url escaping.
- * - 'no'/'off'/0 - turns off escaping
- * - plural - The plural version of the text (2nd parameter of ngettext())
- * - count - The item count for plural mode (3rd parameter of ngettext())
- */
-function smarty_block_t($params, $text, &$smarty)
-{
- $text = stripslashes($text);
-
- // set escape mode
- if (isset($params['escape'])) {
- $escape = $params['escape'];
- unset($params['escape']);
- }
-
- // set plural version
- if (isset($params['plural'])) {
- $plural = $params['plural'];
- unset($params['plural']);
-
- // set count
- if (isset($params['count'])) {
- $count = $params['count'];
- unset($params['count']);
- }
- }
-
- // use plural if required parameters are set
- if (isset($count) && isset($plural)) {
- $text = ngettext($text, $plural, $count);
- } else { // use normal
- $text = gettext($text);
- }
-
- // run strarg if there are parameters
- if (count($params)) {
- $text = smarty_gettext_strarg($text, $params);
- }
-
- if (!isset($escape) || $escape == 'html') { // html escape, default
- $text = nl2br(htmlspecialchars($text));
- } elseif (isset($escape)) {
- switch ($escape) {
- case 'javascript':
- case 'js':
- // javascript escape
- $text = str_replace('\'', '\\\'', stripslashes($text));
- break;
- case 'url':
- // url escape
- $text = urlencode($text);
- break;
- }
- }
-
- return $text;
-}
-
-?>
hooks/post-receive
--
slbackup-php.git (Debian package slbackup-php)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).
More information about the debian-edu-commits
mailing list