- 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
- 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
- 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
- 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
- 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
- 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
- $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
- 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
- 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
vacation.php
- result of merging edit-vacation.php and users/vacation.php
- vacation.php comes with the svn history of edit-vacation.php
- display "vacation already active" (only) in user mode if vacation is active
(would be useful in admin mode too, but needs a text change)
- various comment updates
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] using sprintf
- change compared to Jan Kruis' patch:
- set return url for users to main.php instead of users/main.php
- set return url for admins after setting $fDomain. Otherwise the return url
does not contain the domain.
- removed unused variable $tDomain
users/vacation.php:
- require(../vacation.php)
- remove everything else
- whitespace changes in the license header
- note: this is completely different from Jan Kruis' patch - his intention was
to remove this file and use ../vacation.php. However, with his way all links
in the users menu would point to the wrong place/directory
edit-vacation.php:
- deleted
templates/vacation.tpl
- display username only in admin mode
templates/list-virtual_mailbox.tpl
- link changed to merged vacation.php
languages/en.lang
- add username in $PALANG[pVacation_result_removed] and
$PALANG[pVacation_result_added] as sprintf variable
- (comments added by Jan Kruis' patch are not part of this commit)
languages/nl.lang
- translation updates
- already contains the sprintf variable in $PALANG[pVacation_result_removed]
and $PALANG[pVacation_result_added]
(updates for other *.lang files follow in another commit)
The following parts of Jan Kruis' patch are not part of this commit:
- rejected:
- variables.inc.php: don't add $Admin_role and $Return_url
If we initialize them, it should be done directly in (edit-)vacation.php,
but the current code always sets them already in all cases.
- templates/users_main.tpl: do not change url for vacation.php
- postponed:
- added comments in en.lang about obsolete texts
Most parts of this commit (see exceptions above) were provided as patch
by Jan Kruis (jan-kruis@SF), see
https://sourceforge.net/tracker/?func=detail&aid=3383236&group_id=191583&atid=937966
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1169 a1433add-5e2c-0410-b055-b7f2511e0802
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
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
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
- 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
- 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
- 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
- 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
- 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
This is a quick&dirty script to remove HTML from the language files.
It will be deleted from SVN again once this job is done.
grep '<' en.lang
will print a TODO list ;-)
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1072 a1433add-5e2c-0410-b055-b7f2511e0802
- 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
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
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
- 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
- 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
- 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
- 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
- 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
- NEW: japanese translation added
by Daisuke Aoyama <aoyama at peach dot ne dot jp> / daoyama @SF
language.php:
- added ja to list of available languages
- added comment about the content of the language list
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@300 a1433add-5e2c-0410-b055-b7f2511e0802
functions.inc.php:
- function check_language
- new optional parameter $use_post (needed by login.php)
- check for language cookie
- check for $_POST['lang']
- removed substr() call because it made pt-br translation unuseable
- new function language_selector
- returns a HTML dropdown language selector
- new function safecookie
- similar to safeget, but for cookies
templates/login.php, templates/users_login.php:
- display language selector dropdown
login.php, users/login.php:
- check for selected language
- set cookie if user selected non-default language
languages/language.php: (NEW FILE)
- list of supported languages
- language names taken from phpMyAdmin login form
common.php:
- include languages/language.php
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@280 a1433add-5e2c-0410-b055-b7f2511e0802
- 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
- new parameter --addcomment - adds a comment to all *.lang files except en.lang
Useful if a text has changed and needs to be re-translated.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@264 a1433add-5e2c-0410-b055-b7f2511e0802
- now that broadcast is in a submenu, there's no need to use "BC"
instead of "broadcast".
Changed in en.lang and all languages where it isn't translated yet.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@237 a1433add-5e2c-0410-b055-b7f2511e0802
- put most code into functions
- lots of whitespace changes and code reordering - this makes the diff
nearly useless, sorry
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@229 a1433add-5e2c-0410-b055-b7f2511e0802
- 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
- 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
$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
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
Script to update the language files, with lots of tricky bash code ;-)
MUST be run everytime you add a string to en.lang.
./language-update.sh --patch
should do the job, unless something goes wrong.
./language-update.sh --help
prints all available options.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@155 a1433add-5e2c-0410-b055-b7f2511e0802
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
- 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
(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
new language variables:
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE ';
$PALANG['pStatus_custom'] = 'Delivers to ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
Some bug fixes. Maybe some new bugs added.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@46 a1433add-5e2c-0410-b055-b7f2511e0802
edit vacation messages, and remove them.
main.php added to admin directory so admin and / can share more
templates.
the new edit-vacation.php in admin and / are identical except
for template references
languages/en.lang and languages/default.lang are in sync now
I attempted to add some of the new .lang variables I created to
the spanish file (I don't know it that well, hope its OK)
fixed a bug in users/vacation.php
Added a "Main" menu item to the admin menu that gets you back to where
you started when you log in.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@2 a1433add-5e2c-0410-b055-b7f2511e0802
Christian Boltz