0
0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-20 03:36:20 +02:00
Commit Graph

123 Commits

Author SHA1 Message Date
Christian Boltz
c70465f0e3 *.lang:
- rename $PALANG['pCreate_alias_address_text_error2'] to 
  $PALANG['email-address-already-exists']
- delete $PALANG['pCreate_mailbox_username_text_error2']

model/*:
- use new $PALANG names


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1506 a1433add-5e2c-0410-b055-b7f2511e0802
2013-07-28 20:14:57 +00:00
Christian Boltz
9e2e914c17 *.lang:
- remove unused
  -$PALANG['pCreate_mailbox_password_text_error']
  -$PALANG['pAdminCreate_admin_password_text_error']
  -$PALANG['pAdminEdit_admin_password_text_error']



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1505 a1433add-5e2c-0410-b055-b7f2511e0802
2013-07-28 20:03:13 +00:00
Christian Boltz
80591f97bc *.lang:
- add $PALANG['password'] to replace duplicate texts
  -$PALANG['pLogin_password']
  -$PALANG['pCreate_mailbox_password']
  -$PALANG['pAdminEdit_admin_password']
- set $PALANG['pFetchmail_field_src_password']= $PALANG['password']; 
  (needed until fetchmail is migrated into FetchmailHandler)

model/*, setup.php, templates/*:
- use $PALANG['password'] everywhere	  


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1504 a1433add-5e2c-0410-b055-b7f2511e0802
2013-07-28 19:46:50 +00:00
Christian Boltz
a1646f84b6 *.lang:
- add $PALANG['active'] = 'Active' to replace various duplicates:
  -$PALANG['pOverview_alias_active']
  -$PALANG['pOverview_alias_domain_active']
  -$PALANG['pOverview_mailbox_active']
  -$PALANG['pCreate_alias_active']
  -$PALANG['pEdit_alias_active']
  -$PALANG['pCreate_mailbox_active']
  -$PALANG['pAdminList_admin_active']
  -$PALANG['pAdminList_domain_active']
  -$PALANG['pAdminList_virtual_mailbox_active']
  -$PALANG['pAdminEdit_domain_active']
  -$PALANG['pAdminEdit_admin_active']

model/*, templates/*:
- use $PALANG['active'] everywhere


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1503 a1433add-5e2c-0410-b055-b7f2511e0802
2013-07-28 19:24:00 +00:00
Christian Boltz
bf0a5c02f4 *.lang:
- add $PALANG['domain'] = 'Domain'; which replaces duplicate texts:
  -$PALANG['pOverview_get_domain']
  -$PALANG['pViewlog_domain']
  -$PALANG['pAdminList_admin_domain']
  -$PALANG['pAdminList_domain_domain']
  -$PALANG['pAdminEdit_domain_domain']
  -$PALANG['pAdminCreate_admin_address']

model/*, templates/*:
- update to use $PALANG['domain']  


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1502 a1433add-5e2c-0410-b055-b7f2511e0802
2013-07-28 18:25:43 +00:00
Christian Boltz
3fedee3074 *.lang and various templates:
- use PALANG['last_modified'] everywhere
- get rid of various duplicate texts for "Last modified":
  -$PALANG['pOverview_alias_modified']
  -$PALANG['pOverview_alias_domain_modified']
  -$PALANG['pOverview_mailbox_modified']
  -$PALANG['pOverview_get_modified']
  -$PALANG['pAdminList_admin_modified']
  -$PALANG['pAdminList_virtual_alias_modified']
  -$PALANG['pAdminList_virtual_mailbox_modified']
- add a translator note to some *.lang if the texts were not exact duplicates


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1501 a1433add-5e2c-0410-b055-b7f2511e0802
2013-07-28 18:13:37 +00:00
Christian Boltz
fcee414740 *.lang and various other files:
- rename $PALANG['pAdminList_domain_modified'] to $PALANG['last_modified']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1500 a1433add-5e2c-0410-b055-b7f2511e0802
2013-07-27 21:52:52 +00:00
Christian Boltz
1d94a89424 templates/vacation.tpl:
- replace $PALANG.pUsersLogin_username with $PALANG.pLogin_username

languages/*.lang:
- remove obsolete pUsersLogin_username
- add translator notes in some languages


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1496 a1433add-5e2c-0410-b055-b7f2511e0802
2013-06-24 20:56:34 +00:00
Christian Boltz
f487017bb0 *.lang:
- $PALANG['pInvalidMailRegex']: add mail address as %s:
  "Invalid email address %s, fails regexp check";


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1495 a1433add-5e2c-0410-b055-b7f2511e0802
2013-06-24 20:29:55 +00:00
Christian Boltz
6e13314f52 *.lang:
- remove 38 unused texts


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1464 a1433add-5e2c-0410-b055-b7f2511e0802
2013-05-01 19:35:11 +00:00
Christian Boltz
0b4f71aab4 *.lang:
- change $PALANG['pCreate_alias_result_success'] to 'The alias %s has 
  been created!' (%s added, less technical wording)

nl.lang:
- removed duplicated $PALANG['pVacation_result_added']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1462 a1433add-5e2c-0410-b055-b7f2511e0802
2013-05-01 19:18:51 +00:00
Christian Boltz
50252ecf6a *.lang:
- add $PALANG['mb_max'] = 'MB (max: %s)';
- $PALANG['pVacation_reply_type']
  $PALANG['pVacation_reply_delay_time']
  $PALANG['pVacation_reply_delay_time_text']
  was only in en.lang - add it to the translations



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1414 a1433add-5e2c-0410-b055-b7f2511e0802
2012-12-28 23:05:44 +00:00
Christian Boltz
4635480afd de.lang, it.lang:
- replace htmlentities with the actual character


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1381 a1433add-5e2c-0410-b055-b7f2511e0802
2012-04-29 19:12:33 +00:00
Christian Boltz
4b7929626a *.lang:
- new text: pViewlog_action_edit_vacation (log entry for "edit vacation")
- new text super_admin_desc (explanation what "superadmin" means)
  https://sourceforge.net/tracker/?func=detail&aid=1865123&group_id=191583&atid=937964



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1365 a1433add-5e2c-0410-b055-b7f2511e0802
2012-04-09 20:17:19 +00:00
Christian Boltz
b335abf02e functions.inc.php - db_log():
- allow log actions create_admin and edit_admin
- add edit_admin_state and delete_admin as comment/reminder that they 
  should also be logged

*.lang:
- add text for the new "create admin" and "edit admin" log actions


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1298 a1433add-5e2c-0410-b055-b7f2511e0802
2011-12-19 23:40:34 +00:00
Christian Boltz
dd21f03616 functions.inc.php - db_log():
- add log action 'edit_alias_domain'
- update outdated comment to point to $action_list instead of 
  maintaining the list as comment _and_ variable

languages/*.lang
- add $PALANG['pViewlog_action_edit_alias_domain']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1278 a1433add-5e2c-0410-b055-b7f2511e0802
2011-11-13 23:11:35 +00:00
Christian Boltz
e21e843c8d templates/create-alias-domain.tpl:
- use PALANG.pAdminEdit_domain_active instead of 
  PALANG.pCreate_alias_domain_active

languages/*.lang
- mark $PALANG['pCreate_alias_domain_active'] as obsolete



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1263 a1433add-5e2c-0410-b055-b7f2511e0802
2011-11-05 18:20:19 +00:00
Christian Boltz
46a475a75f *.lang:
- new text $PALANG['created'] = 'Created';


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1257 a1433add-5e2c-0410-b055-b7f2511e0802
2011-10-31 20:49:23 +00:00
Christian Boltz
46c7455a12 en.lang:
- changed pVacation_result_removed from 'Auto response for %s has been 
  removed!' to '... has been disabled!'

*.lang:
- add %s in pVacation_result_removed and pVacation_result (+ translator note)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1243 a1433add-5e2c-0410-b055-b7f2511e0802
2011-10-25 19:08:33 +00:00
Christian Boltz
e88a7afdc2 *.lang:
- new error message: 
  $PALANG['domain_does_not_exist'] = 'This domain does not exist!';


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1206 a1433add-5e2c-0410-b055-b7f2511e0802
2011-10-16 21:17:20 +00:00
Christian Boltz
6becdbba4a *.lang:
- $PALANG['pCreate_mailbox_mail'] = 'Send welcome mail', but some 
  translations mean "create mailbox".
  Added a note for translators to update it.

Reported by Segeja in #postfixadmin


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1202 a1433add-5e2c-0410-b055-b7f2511e0802
2011-10-14 17:42:14 +00:00
Christian Boltz
3589514932 list-virtual.php:
- better error message if no domains exist or a domain admin doesn't
  have permissions for any domain. That's less confusing than the
  "Invalid parameter" message

*.lang:
- new (error) messages
  - $PALANG['no_domains_for_this_admin']
  - $PALANG['no_domains_exist']
 


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1195 a1433add-5e2c-0410-b055-b7f2511e0802
2011-09-29 22:07:27 +00:00
Christian Boltz
e38ba1f7cf users/password.php, edit-admin.php, edit-mailbox.php, *.lang:
- rename $PALANG['pPasswordTooShort'] to $PALANG['password_too_short']

*.lang:
- add $PALANG['password_no_characters'] and $PALANG['password_no_digits']
  (will be used by my next commit)



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1191 a1433add-5e2c-0410-b055-b7f2511e0802
2011-09-25 16:52:25 +00:00
Christian Boltz
8f805af202 de.lang:
- fix typo


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1182 a1433add-5e2c-0410-b055-b7f2511e0802
2011-09-16 20:26:34 +00:00
Christian Boltz
15fe167948 *.lang:
- marked several texts as obsolete:
  - pUsersVacation_button_away
  - pUsersVacation_button_back
  - pUsersVacation_result_error
  - pUsersVacation_result_success
  - pUsersVacation_activefrom
  - pUsersVacation_activeuntil

This is based on a patch by jan-kruis,
https://sourceforge.net/tracker/?func=detail&aid=3383236&group_id=191583&atid=937966
(to be exact: the remaining parts of his patch)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1170 a1433add-5e2c-0410-b055-b7f2511e0802
2011-08-21 20:11:14 +00:00
Christian Boltz
57d25d3d41 Merge edit-mailbox.tpl and edit-mailbox.tpl:
edit-mailbox.tpl:
- merged with create-mailbox.tpl
- added various {if $mode = ...}
- use $PALANG.pCreate_mailbox_password (text: "Password") instead of
  $PALANG.pEdit_mailbox_password text (text: "New password") for edit mode

create-mailbox.tpl:
- deleted

edit-mailbox.php:
- add smarty mode = edit variable

create-mailbox.php
- add smarty mode = create variable

*.lang:
- marked pEdit_mailbox_password and pEdit_mailbox_password2 as obsolete


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1154 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-31 15:22:17 +00:00
Christian Boltz
e5c68e2450 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
2011-07-31 15:05:33 +00:00
Christian Boltz
0fe45bca8a Merge admin_edit-admin.tpl and admin_create-admin.tpl
create-admin.php
- switch to edit-admin template
- rename a smarty variable
- add smarty mode = create variable

edit-admin.php:
- rename a smarty variable
- add smarty mode = edit variable

admin_edit-admin.tpl:
- merge with admin_create-admin.tpl
- add some {if $mode == '...'} switches 
- change <form> name to "admin"
- rename a smarty variable

admin_create-admin.tpl:
- deleted

*.lang:
- mark some $PALANG texts as obsolete:
  - $PALANG['pAdminCreate_admin_username']
  - $PALANG['pAdminCreate_admin_password'
  - $PALANG['pAdminCreate_admin_password2']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1151 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-31 14:09:16 +00:00
Christian Boltz
8f2a3f00ad admin_create-domain.tpl:
- replaced lots of PALANG[pAdminCreate_*] with PALANG[pAdminEdit_*]
- this will make merging with the edit-domain template easier

*.lang
- marked several $PALANG variables as obsolete:
  - pAdminCreate_domain_domain
  - pAdminCreate_domain_description
  - pAdminCreate_domain_aliases
  - pAdminCreate_domain_aliases_text
  - pAdminCreate_domain_mailboxes
  - pAdminCreate_domain_mailboxes_text
  - pAdminCreate_domain_maxquota
  - pAdminCreate_domain_maxquota_text
  - pAdminCreate_domain_transport
  - pAdminCreate_domain_transport_text
  - pAdminCreate_domain_backupmx
- added some "please check" translator notes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1149 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-30 00:19:32 +00:00
Christian Boltz
94dbfa2bb4 Mostly merge edit-mailbox.tpl and create-mailbox.tpl
edit-mailbox.php
- report password errors next to the password field instead of flash_error()
- small changes to smarty variables

create-mailbox.php:
- small changes to smarty variables

edit-mailbox.tpl, create-mailbox.tpl:
- merge as good as possible (everything that is still left will probably
  need an {if}
- renamed some smarty variables
- use colspan=3 for buttons

*.lang:
- mark pCreate_mailbox_username, pCreate_mailbox_name, pCreate_mailbox_quota,
  pCreate_mailbox_quota_text and pEdit_mailbox_name_text as obsolete
- added some "please check" notes for translators



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1146 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-29 23:30:54 +00:00
Christian Boltz
b065366a91 Merge template for admin login and user login
login.php, users/login.php:
- set logintype=admin/user smarty variable
- cleanup: move smarty assignments outside of GET/POST handling - it's
  the same for both

users/login.php:
- do not pre-fill username on failed login

templates/login.tpl:
- merge in users_login.tpl
- add some {if} to handle the differences between admin and user login

templates/users_login.tpl:
- deleted

*.lang:
- mark pUsersLogin_username, pUsersLogin_password, pUsersLogin_language 
  and pUsersLogin_button as obsolete
- add some notes if pLogin_* and pUsersLogin differ


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1137 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-29 18:04:09 +00:00
Christian Boltz
744872191f de.lang:
- small text change in pCreate_mailbox_password_text_error


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1123 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-23 22:40:43 +00:00
Christian Boltz
ce7b0d5ff5 *.lang
- removed remaining <br /> in
  - $PALANG['pPassword_password_text_error']
  - $PALANG['pAdminCreate_admin_password_text_error']
  - $PALANG['pAdminEdit_admin_password_text_error']
  - $PALANG['pCreate_alias_catchall_text']
  - $PALANG['pCreate_mailbox_password_text_error']
  - (and some other texts not listed here, but only in one or two languages)
- differences to Dale's patch:
  - use a space as replacement for <br /> (instead of nothing)
  - added a note that the translation needs to be be beautified to most languages
    (except en and de, which are already ok)
  - do not change "MB" -> "in MB" in $PALANG['pAdminCreate_domain_maxquota_text']
    and PALANG['pAdminEdit_domain_maxquota_text']

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1119 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-23 20:26:46 +00:00
Christian Boltz
a0aa16f6b7 *.lang:
- some $PALANG texts contained field description and error message in
  one $PALANG text. Removed the field descriptions so that the text only
  contains the error message.
- affected texts:
  - $PALANG['pCreate_alias_goto_text_error']
  - $PALANG['pCreate_mailbox_password_text_error']
  - $PALANG['pAdminCreate_admin_username_text_error1']
  - $PALANG['pAdminCreate_admin_username_text_error2']
- difference to Dale's patch:
  - removed the field description in all *.lang files instead of only
    removing the <br />. I just did this manually.
    (changes in en.lang were part of Dale's patch)
  - added a "# check" in some languages where I'm not sure if I removed
    the correct part (if the first half of the text differed from the
    field description in another $PALANG text)

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1118 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-23 19:57:45 +00:00
Christian Boltz
1476d3e420 *.lang:
- added $PALANG['pUsersLogin_language']
- difference to Dale's patch:
  - NOT added $PALANG['pCreate_alias_help'] to avoid text duplication.
    We can use the existing $PALANG['pEdit_alias_help'] instead.

en.lang:
- fixed typo in $PALANG['pCreate_mailbox_quota_text_error']
- fixed typo in $PALANG['pBroadcast_error_empty'] - this also affects
  not yet translated texts in some *.lang

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1117 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-22 22:52:41 +00:00
Christian Boltz
4671b7c081 *.lang:
- removed all <span> tags
- removed several <br> tags
- marked the following stings as obsolete:
  - pDelete_postdelete_error
  - pDelete_domain_alias_error
  - pEdit_alias_address_error
  - pEdit_alias_domain_error
  - pEdit_mailbox_username_error
  - pPassword_admin_text_error

Note: This commit does not contain all *.lang changes from Dale's patch.
There are some interesting[tm] changes left to check/fix.

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1116 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-22 22:24:21 +00:00
Christian Boltz
2b1f3e4102 login.tpl, users_login.tpl:
- changed <h4> to <th>
- mark labels with <label>
- added a label to the language selector
- removed tMessage

languages/*:
- added PALANG[pLogin_language]

changes compared to Dale's patch:
- users_login.tpl:
  - do not add the <div class="field_container"> ... </div> wraps
  - use PALANG[pLogin_language] instead of PALANG[pUsersLogin_language]
    to avoid a superfluous string/translation
- login.tpl:
  - removed wrong colspan for language selector and login button
- de.lang: added german translation for PALANG[pLogin_language]

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1089 a1433add-5e2c-0410-b055-b7f2511e0802
2011-07-19 19:34:11 +00:00
Christian Boltz
0f49fb81b7 - text change to "Logged _in_ as %s" (the 'in' was missing)
pointed out by supa_user in #postfixadmin
- added a german translation


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1062 a1433add-5e2c-0410-b055-b7f2511e0802
2011-05-25 17:55:37 +00:00
Christian Boltz
408c257659 *.lang:
- new texts 'show' and 'all' for list-virtual (see r1054)
- marked 'pOverview_alias_domain_target' as obsolete (no longer needed since r1052)

de.lang:
- added some translations

language-update.sh:
- made --obsolete working


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1055 a1433add-5e2c-0410-b055-b7f2511e0802
2011-04-24 16:04:55 +00:00
Christian Boltz
091d15e58f *.lang: Preparations for domain level quotas
- added $PALANG['pAdminList_domain_quota'] and
  $PALANG['pAdminEdit_domain_quota']
- mark $PALANG['pAdminList_domain_maxquota'] as obsolete

en.lang:
- added TODO for text change to pAdminCreate_domain_maxquota and
  pAdminEdit_domain_maxquota

These changed are based on the patch from W. Rossmann (W. Rossmann@SF),
https://sourceforge.net/tracker/index.php?func=detail&aid=2974928&group_id=191583&atid=937966


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1041 a1433add-5e2c-0410-b055-b7f2511e0802
2011-04-19 19:51:01 +00:00
Christian Boltz
a6cc2a2947 Changed delete.php to use flash_error(), removed some HTML from languages/*
delete.php: 
- replace various $tMessage=... with flash_error()
- always redirect to the relevant page, even if an error happened
- fix error check in delete admin
- removed HTML formatting (<b>, <span>) from some error messages
- replaced check for pgsql + BEGIN/COMMIT/ROLLBACK with db_begin(),
  db_commit() and db_rollback()
- the smarty message.tpl is most probably superfluous

languages/*.lang:
- removed HTML (<span>) from messages used by delete.php

fetchmail.php, scripts/snippets/baseclass.php
- remove superfluous </span>


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1036 a1433add-5e2c-0410-b055-b7f2511e0802
2011-04-10 22:15:56 +00:00
Christian Boltz
cf1fde5194 languages/*:
several text changes to be more clear (see the en.lang diff for details)

This commit implements most changes from Chris H. (dharmachris@SF) posted at
https://sourceforge.net/tracker/?func=detail&aid=3186094&group_id=191583&atid=937964


Related template changes:

templates/admin_edit-admin.tpl:
- use PALANG.save instead of PALANG.pAdminEdit_admin_button

templates/users_edit-alias.tpl, templates/edit-alias.tpl:
- split PALANG.pEdit_alias_welcome - second half is now PALANG.pEdit_alias_help
  (this avoids the <br /> in the text)
- use PALANG.save instead of PALANG.pEdit_alias_button

templates/edit-mailbox.tpl:
- use PALANG.save instead of $PALANG.pEdit_mailbox_button

templates/admin_edit-domain.tpl:
- use PALANG.save instead of $PALANG.pAdminEdit_domain_button


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1031 a1433add-5e2c-0410-b055-b7f2511e0802
2011-04-10 18:26:52 +00:00
Christian Boltz
fdfcedb621 de.lang:
- remove half/invalid utf-8 char in $PALANG['pCreate_dbLog_createalias']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1014 a1433add-5e2c-0410-b055-b7f2511e0802
2011-03-16 23:05:13 +00:00
Christian Boltz
fb6ee0ea9a sk.lang:
- big translation update by Ondrej Zary (rnbw @sf) - thanks!
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3162501&group_id=191583

*.lang:
- added pViewlog_action_create_domain, pViewlog_action_delete_domain and
  pViewlog_action_edit_domain (was only in en.lang)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@942 a1433add-5e2c-0410-b055-b7f2511e0802
2011-02-01 22:35:54 +00:00
Christian Boltz
4c912f1da8 list-virtual.php:
- hand over $search to smarty templates

templates/list-virtual_alias.tpl, templates/list-virtual_alias_domain.tpl:
- add search result highlighting

templates/list-virtual_mailbox.tpl:
- add search result highlighting
- move output of "Mailbox" / "Forward only" outside the foreach loop
  (was displayed once per mailbox alias target)

css/default.css:
- add style for ".searchresult"



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@868 a1433add-5e2c-0410-b055-b7f2511e0802
2010-09-26 23:14:42 +00:00
Christian Boltz
76dc501a52 *.lang:
- added missing strings

language-update.sh:
- made --forcepatch more robust


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@772 a1433add-5e2c-0410-b055-b7f2511e0802
2009-11-16 22:31:56 +00:00
Sebastian
b1287d97e2 - big merge of Postfixadmin smarty into trunk
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@757 a1433add-5e2c-0410-b055-b7f2511e0802
2009-11-05 14:55:39 +00:00
Christian Boltz
7ea19f84ef de.lang:
- fix wrong translation


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@750 a1433add-5e2c-0410-b055-b7f2511e0802
2009-11-01 23:46:42 +00:00
Christian Boltz
2411cd7765 login.php
- put '<span class="error_msg">' and '</span>' into login.php, not in *.lang

languages/*.lang:
- removed pLogin_username_incorrect and pLogin_password_incorrect texts
- added pLogin_failed to all translations (without the wrapping <span>)
- removed the <span> from pLogin_failed in en.lang and fi.lang

translation-update.sh:
- added "--remove string" option to remove texts from language files



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@550 a1433add-5e2c-0410-b055-b7f2511e0802
2009-01-25 20:53:11 +00:00
Christian Boltz
d24ffeeb80 de.lang:
- translated several texts


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@549 a1433add-5e2c-0410-b055-b7f2511e0802
2009-01-25 20:16:05 +00:00
Christian Boltz
6a5cd59785 fetchmail.php:
- allow superadmin to create fetchmail entry for any mailbox, not only for himself
  https://sourceforge.net/tracker/index.php?func=detail&aid=2147740&group_id=191583&atid=937964

upgrade.php, fetchmail.php, fetchmail.pl:
- rename fetchmail ssl field to usessl - "ssl" is a reserved word in MySQL and 
  therefore causes various problems (we would need to quote the field name 
  everywhere)
  https://sourceforge.net/tracker/index.php?func=detail&aid=2265333&group_id=191583&atid=937964

languages/*.lang:
- renamed strings for fetchmail (use)ssl field



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@479 a1433add-5e2c-0410-b055-b7f2511e0802
2008-11-12 21:48:31 +00:00
Christian Boltz
77b3627667 Applying the patch from Stefan Breitegger (tuxstef @SF), see
https://sourceforge.net/tracker/index.php?func=detail&aid=1995478&group_id=191583&atid=937966
+ some small changes

fetchmail.php
- add checkbox to allow setting the fetchmail "ssl" option

fetchmail.pl:
- honor ssl option if set

upgrade.php:
- add ssl column to fetchmail table

*.lang:
- added field name and description for fetchmail ssl option


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@439 a1433add-5e2c-0410-b055-b7f2511e0802
2008-08-05 20:51:23 +00:00
Christian Boltz
3e5549bfad functions.inc.php:
- move DNS checks from check_email() to check_domain()
- add clear error message on non-resolvable domains (using flash_error() -
  this is probably not the best solution, but better than nothing)
- made error messages translatable

create-domain.php:
- avoid duplicated call to check_domain (to avoid duplicated error message)
- domains are now DNS-checked on creation - see the changes in check_domain()
  in functions.inc.php

languages/*:
- added error messages for the above changes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@429 a1433add-5e2c-0410-b055-b7f2511e0802
2008-07-29 23:18:40 +00:00
Christian Boltz
41d5ee4ecb create-alias-domain.php:
- filter available alias and target domains (and print an error message
  if none is available)
- print success message via flash_info, not inside the form and do a
  redirect afterwards. We would have to update the list of domains
  available for aliasing otherwise.
- added vim: settings
 
templates/create-alias-domain.php:
- hide form if no domains are available for aliasing
- move logic of skipping non-available domains to /create-alias-domain.php
- added vim: settings

templates/list-virtual.php:
- show "create alias domain" link (only) if it makes sence (not perfect
  yet, but better than before)
- don't create empty <div> etc. if domain has no mailboxes
- intentionally skipped most whitespace fixes (added a comment instead),
  they would make the patch unreadable

languages/*:
- additional error message for alias domains: 'All domains are already 
  aliased.'


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@422 a1433add-5e2c-0410-b055-b7f2511e0802
2008-07-27 21:28:55 +00:00
Christian Boltz
c67c3cba00 *.lang:
- included all texts for domain aliases to the *.lang files

language-update.sh:
- new parameter --forcepatch
  Similar to --patch, but applies the patch line by line. Useful if 
  --patch fails because of empty lines etc., but much slower.



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@365 a1433add-5e2c-0410-b055-b7f2511e0802
2008-05-21 23:25:39 +00:00
Christian Boltz
8f637b2162 de.lang:
- small fix: Mailboxes -> Mailboxen


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@290 a1433add-5e2c-0410-b055-b7f2511e0802
2008-01-06 20:20:42 +00:00
Christian Boltz
282e90691f *.lang:
- added re-translation comments for pSendmail_result_error and 
  pSendmail_result_success

de.lang:
- re-translated the two strings listed above


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@265 a1433add-5e2c-0410-b055-b7f2511e0802
2007-12-06 22:38:36 +00:00
Christian Boltz
fff08905e5 *.lang
- rename $PALANG['pViewlog_action_edit_alias_active']
  to      $PALANG['pViewlog_action_edit_alias_state']
  https://sourceforge.net/tracker/index.php?func=detail&aid=1830376&group_id=191583&atid=937964


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@230 a1433add-5e2c-0410-b055-b7f2511e0802
2007-11-15 20:47:42 +00:00
Christian Boltz
0ee06175d4 *.lang:
- checked for untranslated strings and added XXX markers
- added maintainer as a comment (taken from svn log and SF)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@222 a1433add-5e2c-0410-b055-b7f2511e0802
2007-11-14 18:27:24 +00:00
Christian Boltz
18cebb5622 fetchmail.php:
- made edit form labels and descriptions translatable. This means that
  $fm_struct no longer holds the labels and descriptions
- fixed HTML error (missing > for </span>
- added some comments to document the main "if" block

fetchmail.tpl:
- changed button order and placement to make <enter> saving the entry
- made save and cancel buttons translatable
  Thanks to Johan for the reminder
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1830326&group_id=191583
- made edit form labels and descriptions translatable. This also means
  reworking of some list(...) = $fm_struct[$row] sections

*.lang:
- added translations for "Save" and "Cancel" buttons
- added translations for edit form labels and descriptions

de.lang:
- translated fetchmail-related texts


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@220 a1433add-5e2c-0410-b055-b7f2511e0802
2007-11-12 22:06:01 +00:00
Christian Boltz
3aa9032cd9 list-virtual.tpl
- made '[and x more...]' translatable

*.lang:
- added 'and_x_more'
- added $Id$ keyword
- enabled expansion of $Id$ and $Rev$


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@208 a1433add-5e2c-0410-b055-b7f2511e0802
2007-11-11 22:48:07 +00:00
Christian Boltz
f541634e39 - renamed -$PALANG['pViewlog_action_edit_alias_state'] to
$PALANG['pViewlog_action_edit_alias_active'] - fixes undefined
  messages in viewlog.php
- added some new strings to the language files
- pFetchmail_* strings were at the wrong location in several languages
- enforce at least one line of matching context in language-check.sh
  This might cause rejects (especially if there are empty lines next to
  the change), but avoids that strings are inserted at the wrong position



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@195 a1433add-5e2c-0410-b055-b7f2511e0802
2007-11-04 20:55:17 +00:00
Christian Boltz
2f25e8bd42 The work of two nights causes a long changelog. Here we go:
fetchmail.php:
- IMPORTANT: fixed typo in database column name. If you have created the
  fetchmail database already, you have to rename the "pool_time" column
  to "poll_time"
- fixed adding of new entries
- don't display status fields (last poll date and result) in edit mode
- validate and quote the GET and POST variables
- show POSTed data again if invalid values were entered (data to display
  in the edit form is passed to fetchmail.tpl in $formvars)
- check results of database operations and display error/success
  messages
- check owner of target mailbox on all operations
- changed password handling: empty means no change (instead of sending
  "******" around)
- reworked and moved around large code portions
- added some TODO notes

fetchmail.tpl:
- use data from $formvars in edit mode instead of parsing the full array
- moved "new entry" below the table
- replaced delete button with delete links
- Note: the boolean fields need testing with PgSQL. Especially test if
  they are displayed as active correctly in list and edit mode!

*.lang:
- added several fetchmail-related strings, more to follow
- added $PALANG['please_keep_this_as_last_entry'] which always has to be
  the last entry in the language files. This solves the problem that
  language-check.sh mixes up the string order when adding strings at the
  end of the language files.
- added vim:ft=php



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@163 a1433add-5e2c-0410-b055-b7f2511e0802
2007-10-25 22:59:52 +00:00
Christian Boltz
194ae6842d - included missing strings into every language file (in english, with
a '# XXX' comment for translators). This makes translation easier.
- added vim: comment to all language files
- this obsoletes default.lang - removed


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@154 a1433add-5e2c-0410-b055-b7f2511e0802
2007-10-13 19:10:41 +00:00
Christian Boltz
b424d39574 - added fetchmail.php to menu.tpl (only displayed if $CONF['fetchmail'] == 'YES')
- shortened german menu text for fetchmail
- config.inc.php:
  - added $CONF['fetchmail'] and $CONF['fetchmail_extra_options'], including
    a big warning for the latter one.
  - include config.inc.php at the end if it exists. This can make future
    updates easier because you don't have to edit config.inc.php itsself.
    It should also make development easier because you don't need to undo
    local changes before commiting config.inc.php
- fetchmail.tpl:
  - new array display_fields, contains the list of fields to display in the
    table. This also solves most "undefined index" warnings.

Note: editing fetchmail does not honor $CONF['fetchmail_extra_options'] = 'NO' yet.


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@151 a1433add-5e2c-0410-b055-b7f2511e0802
2007-10-11 22:27:25 +00:00
Christian Boltz
fdf00fe4c4 - added several german translations
- fixed a typo in fr.lang
- removed some no longer used translations from en.lang, cs.lang and es.lang


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@145 a1433add-5e2c-0410-b055-b7f2511e0802
2007-10-09 22:36:13 +00:00
Christian Boltz
c4040c8227 - initial version of fetchmail support (by Viktor Gotwig,info AT symateam.de)
(see postfixadmin-devel mailinglist for detailed description and known 
  problems, subject "fetchmail support")
- encoded some german umlauts as htmlentities


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@140 a1433add-5e2c-0410-b055-b7f2511e0802
2007-10-07 23:12:07 +00:00
David Goodwin
11902aef57 spelling tpyo fix (s/succes/success/)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@84 a1433add-5e2c-0410-b055-b7f2511e0802
2007-09-24 07:09:31 +00:00
David Goodwin
6ae0207bf5 re-encoded to unicode; thanks to amsys - see part of patch http://sourceforge.net/tracker/index.php?func=detail&aid=1798757&group_id=191583&atid=937966 (conv.bash.gz)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@59 a1433add-5e2c-0410-b055-b7f2511e0802
2007-09-20 14:19:15 +00:00
Christian Boltz
82ac0562e2 - some translations
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@44 a1433add-5e2c-0410-b055-b7f2511e0802
2007-08-21 22:44:32 +00:00
Greg
889ab4c976 changed word 'search' to $PALANG['pSearch']
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@12 a1433add-5e2c-0410-b055-b7f2511e0802
2007-07-25 21:54:18 +00:00
Greg
d7cca670cb patches by Christian Boltz applied
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@3 a1433add-5e2c-0410-b055-b7f2511e0802
2007-06-20 01:48:44 +00:00
Mischa Peters
85dc57beee Initial Import in SourceForge
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1 a1433add-5e2c-0410-b055-b7f2511e0802
2007-03-24 07:27:00 +00:00