[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[3901] trunk
- Subject: SF.net SVN: ledger-smb:[3901] trunk
- From: ..hidden..
- Date: Thu, 20 Oct 2011 22:58:08 +0000
Revision: 3901
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3901&view=rev
Author: einhverfr
Date: 2011-10-20 22:58:07 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Sysconfig.pm
trunk/README.translations
trunk/UI/Admin/edit_user.html
trunk/install.sh
trunk/locale/LedgerSMB.pot
trunk/sql/Pg-database.sql
trunk/sql/modules/Roles.sql
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/employee.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-3885
+ /branches/1.3:3711-3900
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/Changelog 2011-10-20 22:58:07 UTC (rev 3901)
@@ -13,6 +13,13 @@
* Fixed a few files where suExec fixes were not applied (Chris T)
* Fixed erroneous buttons marked "Save and Post" showing up (Chris T)
* Corrected test cases so they do not fail w/o optional LaTeX mods (Chris T)
+* Made errors saving chart of accounts entry more friendly (Chris T)
+* Fixed permissions issue involving yearend (Chris T)
+* Fixed filename issue in install.sh (Chris T)
+* Fixed stylesheet/salutations display issue in user editing screen (Chris T)
+* Correcting LedgerSMB.pot (bug reported by Herman V) (Chris T)
+* Documented parameterized translation syntax for .po files (Herman V)
+* Added en_GB and en_US to language table for new installations (Chris T)
Changelog for LedgerSMB 1.3.1
* Language selection for invoice templates fixed (Chris T)
Modified: trunk/LedgerSMB/Scripts/admin.pm
===================================================================
--- trunk/LedgerSMB/Scripts/admin.pm 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/LedgerSMB/Scripts/admin.pm 2011-10-20 22:58:07 UTC (rev 3901)
@@ -56,17 +56,20 @@
format => 'HTML',
path=>'UI'
);
+ my @countries = $admin->get_countries();
+ my @salutations = $admin->get_salutations();
my $template_data =
{
- user=>$user_obj,
- roles=>@all_roles,
- countries=>$admin->get_countries(),
- user_roles=>$user_obj->{roles},
- salutations=>$admin->get_salutations(),
+ user => $user_obj,
+ roles => @all_roles,
+ countries => $admin->get_countries(),
+ user_roles => $user_obj->{roles},
default_country => $dcsetting->{value},
- admin => $admin,
- stylesheet => $request->{stylesheet},
+ admin => $admin,
+ stylesheet => $request->{stylesheet},
+ salutations => ..hidden..,
};
+
for my $key (keys(%{$otd})) {
@@ -121,11 +124,11 @@
{
user=>{user => $request, employee => $request},
countries=>$admin->get_countries(),
- salutations=>$admin->get_salutations(),
+ stylesheet => $request->{stylesheet},
contact_classes=>$admin->get_contact_classes(),
default_country => $dcsetting->{value},
admin => $admin,
- stylesheet => $request->{stylesheet},
+ salutations=>$admin->get_salutations(),
}
);
return;
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-3885
/branches/1.3/scripts/employee.pl:3842-3843
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-3900
/branches/1.3/scripts/employee.pl:3842-3843
Modified: trunk/LedgerSMB/Sysconfig.pm
===================================================================
--- trunk/LedgerSMB/Sysconfig.pm 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/LedgerSMB/Sysconfig.pm 2011-10-20 22:58:07 UTC (rev 3901)
@@ -114,16 +114,6 @@
${$var} = $config{''}{$var} if $config{''}{$var};
}
-if ($latex){
- eval { require Template::Latex }; # Trap errors loading this optional module
- if ($!) { # Couldn't load Template::Latex
- print STDERR "WARNING: LedgerSMB configured to use LaTeX but module ";
- print STDERR "Template::Latex did not load: ..hidden..";
- print STDERR "Disabling LaTeX support\n";
- $latex = 0;
- };
-}
-
%printer = %{ $config{printers} } if $config{printers};
# ENV Paths
@@ -145,14 +135,6 @@
${$var} = $config{programs}{$var} if $config{programs}{$var};
}
-# LaTeX and friends
-for my $var (qw(pdflatex latex dvips)){
- if ($latex and $config{programs}{$var}){
- my $funcname = "${var}_path";
- Template::Latex->$funcname( { $var => $config{programs}{$var} });
- }
-}
-
# mail configuration
for my $var (qw(sendmail smtphost smtptimeout smtpuser
smtppass smtpauthmethod))
Modified: trunk/README.translations
===================================================================
--- trunk/README.translations 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/README.translations 2011-10-20 22:58:07 UTC (rev 3901)
@@ -55,3 +55,12 @@
ua -> uk
ua_utf -> uk
ve -> es_VE
+
+
+Examples of translation-coding
+in source-file:
+ $locale->text( 'Edit Preferences for [_1]', $form->{login} );
+
+in locale/po/nl_BE:
+ msgid "Edit Preferences for %1"
+ msgstr "Instellingen aanpassen voor %1"
Modified: trunk/UI/Admin/edit_user.html
===================================================================
--- trunk/UI/Admin/edit_user.html 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/UI/Admin/edit_user.html 2011-10-20 22:58:07 UTC (rev 3901)
@@ -105,8 +105,8 @@
<tr>
<td><?lsmb text('Country') ?></td>
<td>
- <?lsmb IF edit_location.country;
- country_id = edit_location.country_id;
+ <?lsmb IF user.entity.country_id;
+ country_id = user.entity.country_id;
ELSE;
country_id = default_country;
END; -?>
Modified: trunk/install.sh
===================================================================
--- trunk/install.sh 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/install.sh 2011-10-20 22:58:07 UTC (rev 3901)
@@ -12,7 +12,7 @@
echo "Configuring Apache"
-sed -i.orig "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf.template
+sed "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf.template > ledgersmb-httpd.conf
echo "Which user does your web server run as?"
read username
Modified: trunk/locale/LedgerSMB.pot
===================================================================
--- trunk/locale/LedgerSMB.pot 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/locale/LedgerSMB.pot 2011-10-20 22:58:07 UTC (rev 3901)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-08 14:35-0700\n"
+"POT-Creation-Date: 2011-10-20 07:08-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <..hidden..>\n"
"Language-Team: LANGUAGE <..hidden..>\n"
@@ -172,7 +172,7 @@
msgstr ""
#: am.pl:163
-msgid "Cannot set multiple options for [_1]"
+msgid "Cannot set multiple options for %1"
msgstr ""
#: am.pl:168
@@ -188,7 +188,7 @@
msgstr ""
#: am.pl:259 rp.pl:860 rp.pl:1270
-msgid "[_1] Report"
+msgid "%1 Report"
msgstr ""
#: am.pl:300
@@ -220,7 +220,7 @@
msgstr ""
#: am.pl:449
-msgid "[_1] GIFI"
+msgid "%1 GIFI"
msgstr ""
#: am.pl:483
@@ -268,7 +268,7 @@
msgstr ""
#: am.pl:677
-msgid "[_1] Department"
+msgid "%1 Department"
msgstr ""
#: am.pl:694 am.pl:848 am.pl:1017 am.pl:1176 am.pl:2029
@@ -296,7 +296,7 @@
msgstr ""
#: am.pl:832
-msgid "[_1] Business"
+msgid "%1 Business"
msgstr ""
#: am.pl:850
@@ -320,7 +320,7 @@
msgstr ""
#: am.pl:999
-msgid "[_1] SIC"
+msgid "%1 SIC"
msgstr ""
#: am.pl:1016 am.pl:1175
@@ -344,7 +344,7 @@
msgstr ""
#: am.pl:1162
-msgid "[_1] Language"
+msgid "%1 Language"
msgstr ""
#: am.pl:1217
@@ -360,8 +360,7 @@
msgstr ""
#: am.pl:1242
-msgid ""
-"Deleting a language will also delete the templates for the language [_1]"
+msgid "Deleting a language will also delete the templates for the language %1"
msgstr ""
#: am.pl:1257
@@ -393,7 +392,7 @@
msgstr ""
#: am.pl:1713
-msgid "Edit Preferences for [_1]"
+msgid "Edit Preferences for %1"
msgstr ""
#: am.pl:1745
@@ -429,11 +428,11 @@
msgstr ""
#: am.pl:1794
-msgid "No email address for [_1]"
+msgid "No email address for %1"
msgstr ""
#: am.pl:1807
-msgid "Backup sent to [_1]"
+msgid "Backup sent to %1"
msgstr ""
#: am.pl:1814
@@ -445,7 +444,7 @@
msgstr ""
#: am.pl:1859
-msgid "Transaction reversal enforced up to [_1]"
+msgid "Transaction reversal enforced up to %1"
msgstr ""
#: am.pl:1863
@@ -469,7 +468,7 @@
msgstr ""
#: am.pl:2013
-msgid "[_1] Warehouse"
+msgid "%1 Warehouse"
msgstr ""
#: am.pl:2031
@@ -592,15 +591,15 @@
msgstr ""
#: am.pl:2575
-msgid "Posting Sales Invoice [_1]"
+msgid "Posting Sales Invoice %1"
msgstr ""
#: am.pl:2585
-msgid "Posting Vendor Invoice [_1]"
+msgid "Posting Vendor Invoice %1"
msgstr ""
#: am.pl:2597 am.pl:2606
-msgid "Posting Transaction [_1]"
+msgid "Posting Transaction %1"
msgstr ""
#: am.pl:2615 am.pl:2686 am.pl:2740 am.pl:2783 am.pl:2830 bp.pl:260
@@ -618,7 +617,7 @@
msgstr ""
#: am.pl:2681
-msgid "Saving [_1] [_2]"
+msgid "Saving %1 %2"
msgstr ""
#: am.pl:2689 am.pl:2786 am.pl:2833
@@ -626,7 +625,7 @@
msgstr ""
#: am.pl:2735
-msgid "Posting GL Transaction [_1]"
+msgid "Posting GL Transaction %1"
msgstr ""
#: am.pl:2772 bp.pl:252
@@ -778,7 +777,7 @@
msgstr ""
#: asset.pl:738
-msgid "Report [_1] on date [_2]"
+msgid "Report %1 on date %2"
msgstr ""
#: asset.pl:742 asset.pl:807 asset.pl:878
@@ -822,7 +821,7 @@
msgstr ""
#: asset.pl:802
-msgid "Partial Disposal Report [_1] on date [_2]"
+msgid "Partial Disposal Report %1 on date %2"
msgstr ""
#: asset.pl:809
@@ -842,7 +841,7 @@
msgstr ""
#: asset.pl:873
-msgid "Disposal Report [_1] on date [_2]"
+msgid "Disposal Report %1 on date %2"
msgstr ""
#: asset.pl:879
@@ -920,7 +919,7 @@
msgstr ""
#: bp.pl:122
-msgid "Print [_1]"
+msgid "Print %1"
msgstr ""
#: bp.pl:191 oe.pl:3346 oe.pl:3612 oe.pl:3636 pe.pl:2788 rp.pl:1392 rp.pl:1653
@@ -952,35 +951,35 @@
msgstr ""
#: bp.pl:299
-msgid "Customer: [_1]"
+msgid "Customer: %1"
msgstr ""
#: bp.pl:300
-msgid "Vendor: [_1]"
+msgid "Vendor: %1"
msgstr ""
#: bp.pl:305 rp.pl:1968
-msgid "Account: [_1]"
+msgid "Account: %1"
msgstr ""
#: bp.pl:310
-msgid "Invoice Number: [_1]"
+msgid "Invoice Number: %1"
msgstr ""
#: bp.pl:315
-msgid "Order Number: [_1]"
+msgid "Order Number: %1"
msgstr ""
#: bp.pl:320
-msgid "Quotation Number: [_1]"
+msgid "Quotation Number: %1"
msgstr ""
#: bp.pl:326 rp.pl:1992
-msgid "From [_1]"
+msgid "From %1"
msgstr ""
#: bp.pl:332 rp.pl:1997
-msgid "To [_1]"
+msgid "To %1"
msgstr ""
#: bp.pl:367 is.pl:279 is.pl:1349 payment.pl:882 rp.pl:955
@@ -1114,11 +1113,11 @@
msgstr ""
#: gl.pl:193
-msgid "[_1] Cash Transfer Transaction"
+msgid "%1 Cash Transfer Transaction"
msgstr ""
#: gl.pl:196
-msgid "[_1] General Ledger Transaction"
+msgid "%1 General Ledger Transaction"
msgstr ""
#: gl.pl:265 ic.pl:859 ir.pl:816 is.pl:912 jc.pl:694 jc.pl:940 oe.pl:775
@@ -1171,7 +1170,7 @@
msgstr ""
#: gl.pl:533
-msgid "General Ledger: [_1] [_2]"
+msgid "General Ledger: %1 %2"
msgstr ""
#: gl.pl:535
@@ -1229,11 +1228,11 @@
msgstr ""
#: gl.pl:903
-msgid "GL report sent to [_1]"
+msgid "GL report sent to %1"
msgstr ""
#: gl.pl:1092
-msgid "Are you sure you want to delete Transaction [_1]"
+msgid "Are you sure you want to delete Transaction %1"
msgstr ""
#: gl.pl:1116
@@ -1661,11 +1660,11 @@
msgstr ""
#: ic.pl:3348
-msgid "[_1]: Vendor not on file!"
+msgid "%1: Vendor not on file!"
msgstr ""
#: ic.pl:3426
-msgid "[_1]: Customer not on file!"
+msgid "%1: Customer not on file!"
msgstr ""
#: ic.pl:3460 pe.pl:2284
@@ -1677,7 +1676,7 @@
msgstr ""
#: ic.pl:3584
-msgid "Inventory quantity must be zero before you can set this [_1] obsolete!"
+msgid "Inventory quantity must be zero before you can set this %1 obsolete!"
msgstr ""
#: ic.pl:3761
@@ -1847,7 +1846,7 @@
msgstr ""
#: ir.pl:1295 is.pl:1365
-msgid "Invoice [_1] posted!"
+msgid "Invoice %1 posted!"
msgstr ""
#: ir.pl:1298 is.pl:1368
@@ -1855,7 +1854,7 @@
msgstr ""
#: ir.pl:1320 is.pl:1414
-msgid "Are you sure you want to delete Invoice Number [_1]?"
+msgid "Are you sure you want to delete Invoice Number %1?"
msgstr ""
#: ir.pl:1335 is.pl:1436
@@ -2141,7 +2140,7 @@
msgstr ""
#: jc.pl:1307
-msgid "Are you sure you want to delete time card for [_1] [_2] [_3]"
+msgid "Are you sure you want to delete time card for %1 %2 %3"
msgstr ""
#: jc.pl:1320
@@ -2865,7 +2864,7 @@
msgstr ""
#: rp.pl:490 rp.pl:505
-msgid "[_1] To [_2]"
+msgid "%1 To %2"
msgstr ""
#: rp.pl:549
@@ -2881,11 +2880,11 @@
msgstr ""
#: rp.pl:648 rp.pl:1000 rp.pl:1743 rp.pl:1932 rp.pl:1973
-msgid "Department: [_1]"
+msgid "Department: %1"
msgstr ""
#: rp.pl:653
-msgid "Project Number: [_1]"
+msgid "Project Number: %1"
msgstr ""
#: rp.pl:704
@@ -2901,7 +2900,7 @@
msgstr ""
#: rp.pl:1018
-msgid "for Period To [_1]"
+msgid "for Period To %1"
msgstr ""
#: rp.pl:1331
@@ -2921,11 +2920,11 @@
msgstr ""
#: rp.pl:1425
-msgid "Statement - [_1]"
+msgid "Statement - %1"
msgstr ""
#: rp.pl:1547
-msgid "Statement sent to [_1]"
+msgid "Statement sent to %1"
msgstr ""
#: rp.pl:1671
@@ -2933,15 +2932,15 @@
msgstr ""
#: rp.pl:1978
-msgid "Description: [_1]"
+msgid "Description: %1"
msgstr ""
#: rp.pl:1983
-msgid "Source: [_1]"
+msgid "Source: %1"
msgstr ""
#: rp.pl:1988
-msgid "Memo: [_1]"
+msgid "Memo: %1"
msgstr ""
#: rp.pl:2013
@@ -2953,7 +2952,7 @@
msgstr ""
#: rp.pl:2023
-msgid "[_1] Number"
+msgid "%1 Number"
msgstr ""
#: rp.pl:2031
@@ -3097,7 +3096,7 @@
msgstr ""
#: sales_quotation.tex:62
-msgid "Fax: [_1]"
+msgid "Fax: %1"
msgstr ""
#: rc-reconciliation.html:71
@@ -3112,15 +3111,6 @@
msgid "Include Exchange Rate Difference"
msgstr ""
-#: reconciliation/upload.html:30
-msgid ""
-",\n"
-"\t\tsize = 12\n"
-"\t} ?>\n"
-"\t<?lsmb INCLUDE input element_data = {\n"
-"\t\tname = "
-msgstr ""
-
#: rc-display-form.html:78
msgid "Under"
msgstr ""
@@ -3136,3 +3126,7 @@
#: Contact/contact.html:640
msgid "Customer Invoice"
msgstr ""
+
+#: UI/menu/expanding.html:43
+msgid "Logged into %1"
+msgstr ""
Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/sql/Pg-database.sql 2011-10-20 22:58:07 UTC (rev 3901)
@@ -1640,6 +1640,8 @@
('de_CH', 'German (Switzerland)'),
('el', 'Greek'),
('en', 'English'),
+ ('en_US', 'English (US)'),
+ ('en_GB', 'English (UK)'),
('es', 'Spanish'),
('es_CO', 'Spanish (Colombia)'),
('es_EC', 'Spanish (Ecuador)'),
Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql 2011-10-20 22:25:04 UTC (rev 3900)
+++ trunk/sql/modules/Roles.sql 2011-10-20 22:58:07 UTC (rev 3901)
@@ -984,6 +984,8 @@
GRANT INSERT, SELECT ON acc_trans, account_checkpoint, yearend
TO "lsmb_<?lsmb dbname ?>__yearend_run";
+GRANT ALL ON account_checkpoint_id_seq TO "lsmb_<?lsmb dbname ?>__yearend_run";
+
INSERT INTO menu_acl (node_id, acl_type, role_name)
values (128, 'allow', 'lsmb_<?lsmb dbname ?>__yearend_run');
INSERT INTO menu_acl (node_id, acl_type, role_name)
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-3885
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-3900
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.