From e5c68e24506f86e3f91593a494092f9fabb20402 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 31 Jul 2011 15:05:33 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1153 a1433add-5e2c-0410-b055-b7f2511e0802 --- create-alias.php | 3 ++- edit-alias.php | 7 +++---- languages/bg.lang | 2 +- languages/ca.lang | 2 +- languages/cn.lang | 2 +- languages/cs.lang | 2 +- languages/da.lang | 4 ++-- languages/de.lang | 2 +- languages/en.lang | 2 +- languages/es.lang | 2 +- languages/et.lang | 2 +- languages/eu.lang | 2 +- languages/fi.lang | 2 +- languages/fo.lang | 2 +- languages/fr.lang | 2 +- languages/hr.lang | 2 +- languages/hu.lang | 2 +- languages/is.lang | 4 ++-- languages/it.lang | 2 +- languages/ja.lang | 6 +++--- languages/lt.lang | 4 ++-- languages/mk.lang | 2 +- languages/nb.lang | 2 +- languages/nl.lang | 2 +- languages/nn.lang | 2 +- languages/pl.lang | 2 +- languages/pt-br.lang | 2 +- languages/ru.lang | 2 +- languages/sk.lang | 2 +- languages/sl.lang | 2 +- languages/sv.lang | 2 +- languages/tr.lang | 4 ++-- languages/tw.lang | 2 +- templates/create-alias.tpl | 36 ---------------------------------- templates/edit-alias.tpl | 40 +++++++++++++++++++++++++++----------- 35 files changed, 71 insertions(+), 89 deletions(-) delete mode 100644 templates/create-alias.tpl diff --git a/create-alias.php b/create-alias.php index d3af6c3a..cbabb2d2 100644 --- a/create-alias.php +++ b/create-alias.php @@ -191,11 +191,12 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } +$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: */ diff --git a/edit-alias.php b/edit-alias.php index ea28ec64..d0527833 100644 --- a/edit-alias.php +++ b/edit-alias.php @@ -128,7 +128,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") if (!check_email($address)) { $error = 1; - $tGoto = $goto; + $tGoto = $_POST['fGoto']; flash_error($PALANG['pEdit_alias_goto_text_error2'] . "$address"); } } @@ -167,11 +167,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } -$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'); diff --git a/languages/bg.lang b/languages/bg.lang index 080746e0..14bf3b38 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -107,7 +107,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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-и!'; diff --git a/languages/ca.lang b/languages/ca.lang index 5a56d864..0f6c0253 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -105,7 +105,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/cn.lang b/languages/cn.lang index 009f5cbc..5f08e582 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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'] = '你的别名已经达到上限!'; diff --git a/languages/cs.lang b/languages/cs.lang index 516381d9..f385abf0 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -111,7 +111,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/da.lang b/languages/da.lang index 30ebfc94..2447a9a2 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -109,7 +109,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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_welcome'] = 'Rediger alias.'; # XXX Text change to: 'Edit f $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: '; diff --git a/languages/de.lang b/languages/de.lang index 651dc2fc..45bc03d8 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -108,7 +108,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domain $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!'; diff --git a/languages/en.lang b/languages/en.lang index 50a6c8b2..bf79e06a 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -110,7 +110,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; $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!'; diff --git a/languages/es.lang b/languages/es.lang index 9576454e..85c6a288 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Ya están todos los dominios asignados $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!'; diff --git a/languages/et.lang b/languages/et.lang index dbf9d641..d290f2d7 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/eu.lang b/languages/eu.lang index f26bae71..7433abf9 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -104,7 +104,7 @@ $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX $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!'; diff --git a/languages/fi.lang b/languages/fi.lang index 8dc64a01..4b544065 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -107,7 +107,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Kaikilla domaineilla on jo alias.'; $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ää!'; diff --git a/languages/fo.lang b/languages/fo.lang index 738acb85..d0760538 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/fr.lang b/languages/fr.lang index 60ea2828..08c969a9 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -107,7 +107,7 @@ $PALANG['pCreate_alias_domain_error3'] = 'Insertion dans la base de donnée éch $PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déj liés un alias.'; $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj prsent 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 !'; diff --git a/languages/hr.lang b/languages/hr.lang index 67c64afd..3d5613f6 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -105,7 +105,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/hu.lang b/languages/hu.lang index a0d824ae..3a808070 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -108,7 +108,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/is.lang b/languages/is.lang index 3925f57c..7c3d67bf 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -105,7 +105,7 @@ $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX $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_welcome'] = 'Breyta alias í léninu.'; # XXX Text change t $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: '; diff --git a/languages/it.lang b/languages/it.lang index 72d2f3e0..5b287617 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -107,7 +107,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/ja.lang b/languages/ja.lang index 6d677976..f3df52ac 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -108,7 +108,7 @@ $PALANG['pCreate_alias_domain_error4'] = '全てのドメインがエイリア $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['pCreate_alias_catchall_text'] = 'すべてのメールを受け取る $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'] = 'このメールアドレスは無効です: '; diff --git a/languages/lt.lang b/languages/lt.lang index add0b7b2..88138e00 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -105,7 +105,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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_welcome'] = 'Keisti srities sinonimą.'; # XXX Text change $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: '; diff --git a/languages/mk.lang b/languages/mk.lang index 8bc511e6..33b027e0 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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'] = 'Го достигнавте вашиот лимит за креирање алијаси!'; diff --git a/languages/nb.lang b/languages/nb.lang index 3218492e..c57b86a1 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -108,7 +108,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Det er allerede opprettet alias for al $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!'; diff --git a/languages/nl.lang b/languages/nl.lang index 12fb94fc..ab0dd634 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -107,7 +107,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Alle domeinen hebben al een alias!'; $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.'; diff --git a/languages/nn.lang b/languages/nn.lang index 29506d86..b1e9793d 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/pl.lang b/languages/pl.lang index 2b10231d..f6e482f2 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -109,7 +109,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Wszystkie domeny są już aliasowane.' $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!'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 239f6bf7..ca121ff6 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -110,7 +110,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Todos os domínios já estão espelhad $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!'; diff --git a/languages/ru.lang b/languages/ru.lang index 5474c2b4..0ec228aa 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -110,7 +110,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Все домены уже задей $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'] = 'Вы достигли лимита по созданным алиасам!'; diff --git a/languages/sk.lang b/languages/sk.lang index 5f4611c1..0818efa2 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -107,7 +107,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Všetky domény už majú aliasy.'; $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!'; diff --git a/languages/sl.lang b/languages/sl.lang index dd0b4c0d..1b3c323e 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/sv.lang b/languages/sv.lang index 7594e5fe..8249b489 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -108,7 +108,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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!'; diff --git a/languages/tr.lang b/languages/tr.lang index 412cc745..b52fbb91 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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_welcome'] = 'domaniniz için bir domain\'i düzenleyin. '; $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: '; diff --git a/languages/tw.lang b/languages/tw.lang index 046a4fca..2e045f52 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -106,7 +106,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X $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'] = '你的別名已經達到上限!'; diff --git a/templates/create-alias.tpl b/templates/create-alias.tpl deleted file mode 100644 index f24dd877..00000000 --- a/templates/create-alias.tpl +++ /dev/null @@ -1,36 +0,0 @@ -{* checkbox *} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{$PALANG.pCreate_alias_welcome}
- - @ - - {$PALANG.pCreate_alias_catchall_text}{$pCreate_alias_address_text_error}
{$PALANG.pCreate_alias_goto_text}

{$PALANG.pEdit_alias_help}		 
 
  
-
-
diff --git a/templates/edit-alias.tpl b/templates/edit-alias.tpl index 12da387e..bf4d2fcf 100644 --- a/templates/edit-alias.tpl +++ b/templates/edit-alias.tpl @@ -2,27 +2,45 @@
- + +{/if} - - + + + - + + +{if $mode == 'create'} + + + + + + +{/if} - +
{$PALANG.pEdit_alias_welcome}
{$PALANG.pEdit_alias_help}		 +{if $mode == 'edit'} + {$PALANG.pEdit_alias_welcome} +{else} + {$PALANG.pCreate_alias_welcome}
{$fAddress}  +{if $mode == 'edit'} + {$fAddress} +{else} + + @ + +{/if} + {if $mode == 'create'}{$PALANG.pCreate_alias_catchall_text}{/if}{$pCreate_alias_address_text_error}
- - {$PALANG.pCreate_alias_goto_text}

{$PALANG.pEdit_alias_help}