SF.net SVN: postfixadmin:[1153] trunk

[<chr...@us...>]

Revision: 1153
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1153&view=rev
Author:   christian_boltz
Date:     2011-07-31 15:05:33 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
Merge edit-alias.tpl and create-alias.tpl

edit-alias.tpl:
- merge with create-alias.tpl
- added various {if $mode = ...}
- for edit mode: used "multiple targets" help text right of textarea
  (instead of having it under the headline)
- use $fGoto instead of array in textarea

create-alias.tpl
- deleted

edit-alias.php:
- fixed $tGoto to contain unmodified $_POST value on error
- dropped $array smarty variable that was used instead of $tGoto
- added mode = edit smarty variable
- add empty pCreate_alias_address_text_error smarty variable to avoid
  "undefined" warning

create-alias.php:
- added mode = create smarty variable
- switched to edit-alias template

*.lang
- marked $PALANG['pCreate_alias_address'] as obsolete

Modified Paths:
--------------
    trunk/create-alias.php
    trunk/edit-alias.php
    trunk/languages/bg.lang
    trunk/languages/ca.lang
    trunk/languages/cn.lang
    trunk/languages/cs.lang
    trunk/languages/da.lang
    trunk/languages/de.lang
    trunk/languages/en.lang
    trunk/languages/es.lang
    trunk/languages/et.lang
    trunk/languages/eu.lang
    trunk/languages/fi.lang
    trunk/languages/fo.lang
    trunk/languages/fr.lang
    trunk/languages/hr.lang
    trunk/languages/hu.lang
    trunk/languages/is.lang
    trunk/languages/it.lang
    trunk/languages/ja.lang
    trunk/languages/lt.lang
    trunk/languages/mk.lang
    trunk/languages/nb.lang
    trunk/languages/nl.lang
    trunk/languages/nn.lang
    trunk/languages/pl.lang
    trunk/languages/pt-br.lang
    trunk/languages/ru.lang
    trunk/languages/sk.lang
    trunk/languages/sl.lang
    trunk/languages/sv.lang
    trunk/languages/tr.lang
    trunk/languages/tw.lang
    trunk/templates/edit-alias.tpl

Removed Paths:
-------------
    trunk/templates/create-alias.tpl

Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/create-alias.php	2011-07-31 15:05:33 UTC (rev 1153)
@@ -191,11 +191,12 @@
     }
 }
 
+$smarty->assign ('mode', 'create');
 $smarty->assign ('tAddress', $tAddress);
 $smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
 $smarty->assign ('pCreate_alias_address_text_error', $pCreate_alias_address_text_error, false);
 $smarty->assign ('tGoto', $tGoto, false);
-$smarty->assign ('smarty_template', 'create-alias');
+$smarty->assign ('smarty_template', 'edit-alias');
 $smarty->display ('index.tpl');
 
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */

Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/edit-alias.php	2011-07-31 15:05:33 UTC (rev 1153)
@@ -128,7 +128,7 @@
       if (!check_email($address))
       {
          $error = 1;
-         $tGoto = $goto;
+         $tGoto = $_POST['fGoto'];
          flash_error($PALANG['pEdit_alias_goto_text_error2'] . "$address");
       }
    }
@@ -167,11 +167,10 @@
    }
 }
 
-$array = preg_split ('/,/', $tGoto);
-
+$smarty->assign ('mode', 'edit');
+$smarty->assign ('pCreate_alias_address_text_error', '');
 $smarty->assign ('fAddress', $fAddress);
 $smarty->assign ('tGoto', $tGoto);
-$smarty->assign ('array', $array, false);
 $smarty->assign ('smarty_template', 'edit-alias');
 $smarty->display ('index.tpl');
 

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/bg.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -107,7 +107,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Създай нов alias за вашия домейн.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Този ALIAS не е валиден!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Този е-мейл адрес вече съществува, моля изберете различен!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Достигнали сте лимита си за създаване на alias-и!';

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/ca.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -105,7 +105,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Crear un nou àlies pel domini.';
-$PALANG['pCreate_alias_address'] = 'Àlies';
+$PALANG['pCreate_alias_address'] = 'Àlies'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'L\'àlies no és vàlid!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Has arribat al límit de creació d\'àlies!';

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/cn.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = '在你的域中新建一个别名.';
-$PALANG['pCreate_alias_address'] = '别名';
+$PALANG['pCreate_alias_address'] = '别名'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
 $PALANG['pCreate_alias_address_text_error2'] = '邮件地址已经存在, 请重新选择!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!';

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/cs.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -111,7 +111,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Vytvořit nové přesměrování ve Vaší doméně.';
-$PALANG['pCreate_alias_address'] = 'Přesměrování';
+$PALANG['pCreate_alias_address'] = 'Přesměrování'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Adresa neni platná!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Taková emailová adresa již existuje!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Dosáhli jste limitu, nemůžete vytvářet další aliasy!';

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/da.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -109,7 +109,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Tilføj nyt alias til dit domæne.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Emailadressen eksisterer allerede. Vælg venligst en anden!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har nået grænsen for antallet af alias til dit domæne!';
@@ -126,7 +126,7 @@
 $PALANG['pEdit_alias_help'] = 'En modtager pr. linje.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_address_error'] = 'Kan ikke finde aliaset!'; # obsolete
-$PALANG['pEdit_alias_goto'] = 'Modtager(e)';
+$PALANG['pEdit_alias_goto'] = 'Modtager(e)'; # XXX check / compare with pCreate_alias_goto - should be "To"
 $PALANG['pEdit_alias_active'] = 'Aktiv';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du udfyldte ikke noget i Modtager(e)';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Den tilføjede emailadresse er ikke gyldig: ';

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/de.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -108,7 +108,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain wurde in der Datenbank eingetragen!';
 
 $PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Sie haben Ihr Limit für Aliase auf dieser Domain erreicht!';

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/en.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -110,7 +110,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!';
 
 $PALANG['pCreate_alias_welcome'] = 'Create a new alias for your domain.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!';
 $PALANG['pCreate_alias_address_text_error2'] = 'This email address already exists, please choose a different one!';
 $PALANG['pCreate_alias_address_text_error3'] = 'You have reached your limit to create aliases!';

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/es.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla!'; 
 
 $PALANG['pCreate_alias_welcome'] = 'Crear un nuevo alias para el dominio.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = '¡El ALIAS no es válido!';
 $PALANG['pCreate_alias_address_text_error2'] = '¡Esta dirección ya existe, elija otra diferente por favor!';
 $PALANG['pCreate_alias_address_text_error3'] = '¡Ha llegado a su límite de creación de alias!';

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/et.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Loo uus alias domeenis.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS pole kehtiv!';
 $PALANG['pCreate_alias_address_text_error2'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Oled kasutanud kogu aliaste arvu!';

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/eu.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -104,7 +104,7 @@
 $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 $PALANG['pCreate_alias_welcome'] = 'Domeinuarentzat alias berri bat sortu.';
-$PALANG['pCreate_alias_address'] = 'Aliasa';
+$PALANG['pCreate_alias_address'] = 'Aliasa'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIASa okerra da!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/fi.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -107,7 +107,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain alias tauluun!';
 
 $PALANG['pCreate_alias_welcome'] = 'Luo uusi alias.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias ei ole oikean muotoinen!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Aliasten maksimimäärä saavutettu. Et voi lisätä aliaksia enää!';

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/fo.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Stovna eitt nýtt dulnevni á tínum navnaøki.';
-$PALANG['pCreate_alias_address'] = 'Dulnevni';
+$PALANG['pCreate_alias_address'] = 'Dulnevni'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'DULNEVNI er ógyldugt!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Tú hevur nátt tínum marki at stovna dulnevni!';

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/fr.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -107,7 +107,7 @@
 $PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déj\xE0 liés \xE0 un alias.';
 $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj\xE0 pr\xE9sent dans la table de domaine!';
 $PALANG['pCreate_alias_welcome'] = 'Créer un nouvel alias pour votre domaine.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Cet ALIAS n\'est pas valide!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !';
 $PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/hr.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -105,7 +105,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Stvori novi alias za domenu.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Ova adresa e-pošte već postoji, molimo izaberite drugu!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Postigli ste maksimalan broj vaših aliasa!';

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/hu.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -108,7 +108,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Új alias készítése az adott domainhez';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Az ALIAS érvénytelen!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Elérted a maximális alias limitet!';

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/is.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -105,7 +105,7 @@
 $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
-$PALANG['pCreate_alias_welcome'] = 'Útbúa nýjan alias fyrir þitt lén.'; $PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_welcome'] = 'Útbúa nýjan alias fyrir þitt lén.'; $PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliasinn er ekki í lagi!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Þetta pósthólf er nú þegar til, veldu annað!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Þú hefur stofnað þann fjölda pósthólfa sem þú hefur heimild til!';
@@ -122,7 +122,7 @@
 $PALANG['pEdit_alias_help'] = 'Ein færsla í einu.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_address_error'] = 'Get ekki fundið aliasinn!'; # obsolete
-$PALANG['pEdit_alias_goto'] = 'To';
+$PALANG['pEdit_alias_goto'] = 'To'; # XXX check / compare with pCreate_alias_goto - should be "To"
 $PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $PALANG['pEdit_alias_goto_text_error1'] = 'þú gafst ekki upp neitt í Til';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Pósthólfið sem þú reynir að nota er ekki til: ';

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/it.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -107,7 +107,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Crea un nuovo alias per il tuo dominio.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'L\' Alias non è valido!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Hai raggiunto il tuo limite per creare alias!';

Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/ja.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -108,7 +108,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = '新しい転送先の作成';
-$PALANG['pCreate_alias_address'] = '転送元アドレス';
+$PALANG['pCreate_alias_address'] = '転送元アドレス'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。';
 $PALANG['pCreate_alias_address_text_error2'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_alias_address_text_error3'] = '転送アドレスの制限数に達しました。';
@@ -123,9 +123,9 @@
 
 $PALANG['pEdit_alias_welcome'] = '転送先アドレスの編集'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = '1行に1エントリです。'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
-$PALANG['pEdit_alias_address'] = '転送元';
+$PALANG['pEdit_alias_address'] = '転送元'; # XXX check / compare with pCreate_alias_address - should be 'Alias'
 $PALANG['pEdit_alias_address_error'] = '転送元が見つかりません！'; # obsolete
-$PALANG['pEdit_alias_goto'] = '転送先';
+$PALANG['pEdit_alias_goto'] = '転送先'; # XXX check / compare with pCreate_alias_goto - should be "To"
 $PALANG['pEdit_alias_active'] = 'アクティブ';
 $PALANG['pEdit_alias_goto_text_error1'] = '転送先が入力されていません。';
 $PALANG['pEdit_alias_goto_text_error2'] = 'このメールアドレスは無効です: ';

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/lt.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -105,7 +105,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Naujas sinonimas.';
-$PALANG['pCreate_alias_address'] = 'Sinonimas';
+$PALANG['pCreate_alias_address'] = 'Sinonimas'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Tokia pašto dėžutė jau yra. Pasirinkite kitą vardą!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Išnaudota visa pašto sinonimų kvota!';
@@ -122,7 +122,7 @@
 $PALANG['pEdit_alias_help'] = 'Eilutėje leidžiamas tik vienas įrašas.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Sinonimas';
 $PALANG['pEdit_alias_address_error'] = 'Sinonimas nerastas!'; # obsolete
-$PALANG['pEdit_alias_goto'] = 'Kam';
+$PALANG['pEdit_alias_goto'] = 'Kam'; # XXX check / compare with pCreate_alias_goto - should be "To"
 $PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $PALANG['pEdit_alias_goto_text_error1'] = 'Neužpildėte lauko "Kam"';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Įvestas neteisingas pašto adresas: ';

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/mk.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Креирање на нов алијас за вашиот домен.';
-$PALANG['pCreate_alias_address'] = 'Алијас';
+$PALANG['pCreate_alias_address'] = 'Алијас'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Алијасот не е валиден!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Оваа адреса веќе постои. Ве молам одберете друга!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Го достигнавте вашиот лимит за креирање алијаси!';

Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/nb.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -108,7 +108,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener!';
 
 $PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har nådd grensen for antall aliaser under dette domenet!';

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/nl.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -107,7 +107,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel!';
 
 $PALANG['pCreate_alias_welcome'] = 'Maak een nieuw alias aan voor uw domein.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'De Alias is niet geldig!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Dit e-mail aders bestaat al, kies aub een andere.';
 $PALANG['pCreate_alias_address_text_error3'] = 'U bezit het maximum aantal aliassen.';

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/nn.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Denne epostadressen eksisterer allerede, velg en annen!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Du er over grensen for antall aliaser i ditt domene!';

Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/pl.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -109,7 +109,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli aliasów domen!';
 
 $PALANG['pCreate_alias_welcome'] = 'Utwórz nowy alias dla Twojej domeny.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias jest niepoprawny!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Taki adres email juz istnieje, proszę wybrać inny!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Twój limit aliasów został osiągniety!';

Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/pt-br.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -110,7 +110,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado!';
 
 $PALANG['pCreate_alias_welcome'] = 'Criação de um novo alias para o domínio.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias inválido!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Você alcançou seu limite de aliases!';

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/ru.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -110,7 +110,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов!';
 
 $PALANG['pCreate_alias_welcome'] = 'Создание нового алиаса в вашем домене.';
-$PALANG['pCreate_alias_address'] = 'Алиас';
+$PALANG['pCreate_alias_address'] = 'Алиас'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Неверное имя алиаса!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.';
 $PALANG['pCreate_alias_address_text_error3'] = 'Вы достигли лимита по созданным алиасам!';

Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/sk.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -107,7 +107,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'Alias domény bol pridaný do tabuľky!';
 
 $PALANG['pCreate_alias_welcome'] = 'Vytvoriť nový alias v doméne';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Adresa nie je platná!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Takáto emailová adresa už existuje!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie aliasy!';

Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/sl.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Ustvari nov alias za določeno domeno.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Sintaksa aliasa je napačna!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Maksimalno število aliasov je preseženo!';

Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/sv.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -108,7 +108,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Skapa nytt alias för din domän.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'Detta ALIAS är inte giltigt!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Denna epostadress existerar redan, välj en annan epostadress!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har redan högsta tillåtna antal alias definierade!';

Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/tr.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = 'Domaininiz için yeni bir alias yaratýn.';
-$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address'] = 'Alias'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS uygun deðil!';
 $PALANG['pCreate_alias_address_text_error2'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Alias limitine ulaþtýnýz!';
@@ -123,7 +123,7 @@
 $PALANG['pEdit_alias_help'] = 'Satýr baþýna bir giriþ.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_address_error'] = 'alias bulunamýyor!'; # obsolete
-$PALANG['pEdit_alias_goto'] = 'Kime';
+$PALANG['pEdit_alias_goto'] = 'Kime'; # XXX check / compare with pCreate_alias_goto - should be "To"
 $PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $PALANG['pEdit_alias_goto_text_error1'] = 'Kime kýsmýna hiçbirþey girmediniz.';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Girdiðiniz e-posta uygun deðil: ';

Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/languages/tw.lang	2011-07-31 15:05:33 UTC (rev 1153)
@@ -106,7 +106,7 @@
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_welcome'] = '在你的網域中新建一個別名.';
-$PALANG['pCreate_alias_address'] = '別名';
+$PALANG['pCreate_alias_address'] = '別名'; # obsolete
 $PALANG['pCreate_alias_address_text_error1'] = '該別名非法!';
 $PALANG['pCreate_alias_address_text_error2'] = '郵件地址已經存在, 請重新選擇!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的別名已經達到上限!';

Deleted: trunk/templates/create-alias.tpl
===================================================================
--- trunk/templates/create-alias.tpl	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/templates/create-alias.tpl	2011-07-31 15:05:33 UTC (rev 1153)
@@ -1,36 +0,0 @@
-{* checkbox *}
-<div id="edit_form">
-<form name="alias" method="post" action="">
-<table>
-	<tr>
-		<th colspan="4">{$PALANG.pCreate_alias_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pCreate_alias_address}:</label></td>
-		<td>
-			<input class="flat" type="text" name="fAddress" value="{$tAddress}" />
-			@
-			<select class="flat" name="fDomain">{$select_options}</select>
-		</td>
-		<td>{$PALANG.pCreate_alias_catchall_text}</td>
-		<td><span class="error_msg">{$pCreate_alias_address_text_error}</span></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pCreate_alias_goto}:</label></td>
-      	<td><textarea class="flat" rows="10" cols="35" name="fGoto">{$tGoto}</textarea></td>
-		<td>{$PALANG.pCreate_alias_goto_text}<br /><br />{$PALANG.pEdit_alias_help}</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pCreate_alias_active}:</label></td>
-		<td><input class="flat" type="checkbox" name="fActive" checked="checked"/></td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_alias_button}" /></td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-</table>
-</form>
-</div>

Modified: trunk/templates/edit-alias.tpl
===================================================================
--- trunk/templates/edit-alias.tpl	2011-07-31 14:32:51 UTC (rev 1152)
+++ trunk/templates/edit-alias.tpl	2011-07-31 15:05:33 UTC (rev 1153)
@@ -2,27 +2,45 @@
 <form name="alias" method="post" action="">
 <table>
 	<tr>
-		<th colspan="3">{$PALANG.pEdit_alias_welcome}<br /><em>{$PALANG.pEdit_alias_help}</em></th>
+		<th colspan="4">
+{if $mode == 'edit'}
+			{$PALANG.pEdit_alias_welcome}
+{else}
+			{$PALANG.pCreate_alias_welcome}</th>
+{/if}
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_alias_address}:</label></td>
-		<td><em>{$fAddress}</em></td>
-		<td>&nbsp;</td>
+		<td>
+{if $mode == 'edit'}
+			<em>{$fAddress}</em>
+{else}
+			<input class="flat" type="text" name="fAddress" value="{$tAddress}" />
+			@
+			<select class="flat" name="fDomain">{$select_options}</select>
+{/if}
+		</td>
+		<td>{if $mode == 'create'}{$PALANG.pCreate_alias_catchall_text}{/if}</td>
+		<td><span class="error_msg">{$pCreate_alias_address_text_error}</span></td>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_alias_goto}:</label></td>
-		<td>
-			<textarea class="flat" rows="10" cols="60" name="fGoto">
-{foreach from=$array item=item}
-{$item}
-{/foreach}
-</textarea>
-		</td>
+		<td><textarea class="flat" rows="10" cols="35" name="fGoto">{$tGoto}</textarea></td>
+		<td>{$PALANG.pCreate_alias_goto_text}<br /><br />{$PALANG.pEdit_alias_help}</td>
 		<td>&nbsp;</td>
 	</tr>
+{if $mode == 'create'}
+<!-- TODO: 'active' should also be available in edit-alias -->
 	<tr>
+		<td class="label"><label>{$PALANG.pCreate_alias_active}:</label></td>
+		<td><input class="flat" type="checkbox" name="fActive" checked="checked"/></td>
+		<td colspan="2">&nbsp;</td>
+	</tr>
+{/if}
+	<tr>
 		<td>&nbsp;</td>
-		<td colspan="2"><input class="button" type="submit" name="submit" value="{$PALANG.save}" /></td>
+		<td colspan="3"><input class="button" type="submit" name="submit" 
+			value="{if $mode == 'edit'}{$PALANG.save}{else}{$PALANG.pCreate_alias_button}{/if}" /></td>
 	</tr>
 </table>
 </form>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.