[Fmsystem-commits] [8855] fixed language strings

[Erik Holm-Larsen]

Revision: 8855
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8855
Author:   erikhl
Date:     2012-02-14 09:54:07 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
fixed language strings

Modified Paths:
--------------
    trunk/controller/inc/class.uicontrol_location.inc.php
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/setup/phpgw_no.lang
    trunk/controller/templates/base/procedure/print_procedure.xsl

Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php       2012-02-14 
07:54:40 UTC (rev 8854)
+++ trunk/controller/inc/class.uicontrol_location.inc.php       2012-02-14 
09:54:07 UTC (rev 8855)
@@ -141,7 +141,7 @@
                                                ),
                                                array(
                                                        'key'   =>      'title',
-                                                       'label' =>      
lang('Property name'),
+                                                       'label' =>      
lang('Control title'),
                                                        'sortable'      =>      
false
                                                ),
                                                array(
@@ -151,7 +151,7 @@
                                                ),
                                                array(
                                                        'key' => 'loc1_name',
-                                                       'label' => 
lang('Location_name'),
+                                                       'label' => 
lang('Property name'),
                                                        'sortable'      => false
                                                ),
                                                array(

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2012-02-14 07:54:40 UTC 
(rev 8854)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2012-02-14 09:54:07 UTC 
(rev 8855)
@@ -553,7 +553,8 @@
                        (
                                'location'      => $location_array,
                                'control'       => $control->toArray(),
-                               'procedure'     => $procedure->toArray()
+                               'procedure'     => $procedure->toArray(),
+                               'dateformat'                    => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
                        );
                        
                        if( !empty($control_group_id) ){

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2012-02-14 07:54:40 UTC (rev 
8854)
+++ trunk/controller/setup/phpgw_no.lang        2012-02-14 09:54:07 UTC (rev 
8855)
@@ -255,6 +255,7 @@
 Procedure attachment   controller      no      Vedlegg
 Procedure start date   controller      no      Start dato
 Procedure end date     controller      no      Slutt dato
+Procedure valid from date      controller      no      Gyldig fra
 New control item       controller      no      Nytt kontrollpunkt
 Control item title     controller      no      Tittel
 Control_group  controller      no      Kontrollgruppe

Modified: trunk/controller/templates/base/procedure/print_procedure.xsl
===================================================================
--- trunk/controller/templates/base/procedure/print_procedure.xsl       
2012-02-14 07:54:40 UTC (rev 8854)
+++ trunk/controller/templates/base/procedure/print_procedure.xsl       
2012-02-14 09:54:07 UTC (rev 8855)
@@ -16,7 +16,7 @@
                        <span style="display: inline-block;width: 
600px;"><xsl:value-of select="procedure/control_area_name" /></span>
                </div>
                <div>
-                       <label for="start_date"><xsl:value-of 
select="php:function('lang','Procedure start date')" /></label>
+                       <label for="start_date"><xsl:value-of 
select="php:function('lang','Procedure valid from date')" /></label>
                        <xsl:variable name="startdate"><xsl:value-of 
select="procedure/start_date" /></xsl:variable>
                        <xsl:value-of select="php:function('date', $dateformat, 
$startdate)" />
                </div>
@@ -49,12 +49,8 @@
                </div>
                <div>
                        <label for="reference"><xsl:value-of 
select="php:function('lang','Procedure Reference')" /></label>
-                       <xsl:value-of select="procedure/reference" />
+                       <xsl:value-of select="procedure/reference" 
disable-output-escaping="yes"/>
                </div>
-               <div>
-                       <label for="attachment"><xsl:value-of 
select="php:function('lang','Procedure Attachment')" /></label>
-                       <xsl:value-of select="procedure/attachment" />
-               </div>
                <a href="#print" class="btn" onClick="window.print()">Skriv 
ut</a>              
 </div>
 <style>