Feng Shu <tuma...@163.com> writes:

> Luis Falcon <fal...@gnuhealth.org> writes:
>
>> Dear Feng Shu
>>
>> On Tue, 20 Jun 2023 15:32:27 +0800
>> Feng Shu <tuma...@163.com> wrote:
>>
>>> Luis Falcon <fal...@gnuhealth.org> writes:
>>> 
>>> > Dear Feng Shu
>>> >
>>> > Thank you very much! Great step forward in report translation! We'll
>>> > test and update the repos in the upcoming days.  
>>> 
>>> Good news.
>>> 
>>> I have updated all report template files except
>>> health_pediatrics_growth_charts_who, my work nealy done :-)
>>> 
>>> health_pediatrics_growth_charts_who use libreoffice's chart feature
>>> and I do not familar this feature, so I decide to not edit them at
>>> the moment.
>>> 
>>> please test and feed back. 
>>> 
>>> NOTE: Before test these template files, we need apply a patch, it add
>>> some field_str to py files. which let develop template file more
>>> simple.
>>> 
>>> 
>> Excellent!! I have applied the patch provided for the strings, as well
>> as the updated reports!
>>
>> Please see:
>> https://hg.savannah.gnu.org/hgweb/health/rev/6dc15610d6d1
>>
>> Please test and check font types and other details (GH uses "FreeSans"
>> font).
>
> Yes
>
> I have updated prescription_orders.fodt and barcode39.fodt again, to fix
> some issues found, please merge them with below two patches, by the way,
> please update zh_CN.po files, so I can check the status of string split
> problem.


Sorry, forgot another patch: 
Delete-the-Carriage-return-at-the-end-of-patient_critical_summary.patch

# HG changeset patch
# User Feng Shu <tuma...@163.com>
# Date 1687314496 -28800
#      Wed Jun 21 10:28:16 2023 +0800
# Node ID 1d059d7a39d606bc362c2cbd49fd62cf1aca2b66
# Parent  ebdbbea9e7e069082d573ed60fb344e619b5b119
Delete the Carriage return at the end of patient_critical_summary

Delete the Carriage return at the end of the patient critical summary,
for it will influence the align in the report.

diff -r ebdbbea9e7e0 -r 1d059d7a39d6 tryton/health/health.py
--- a/tryton/health/health.py	Wed Jun 21 03:57:05 2023 +0200
+++ b/tryton/health/health.py	Wed Jun 21 10:28:16 2023 +0800
@@ -2891,7 +2891,7 @@
                     other_conditions = f"{other_conditions} " \
                                        f"{disease.pathology.rec_name}\n"
 
-        return allergies + other_conditions
+        return (allergies + other_conditions).strip("\n")
 
     name = fields.Many2One(
         'party.party', 'Patient', required=True,



>
>
>
>
>
>
>
>
>
>>
>> Thank you again for this excellent work, that hopefully solves the
>> split strings for translations!
>>
>> All the best
>> Luis

-- 

Reply via email to