Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Translations #536

Merged
merged 8 commits into from
Jul 7, 2016
Merged

Translations #536

merged 8 commits into from
Jul 7, 2016

Conversation

billybonks
Copy link
Contributor

@billybonks billybonks commented Jun 26, 2016

OK so this is quite a few translation changes :)

  • Refactored visits, to look a bit like the rest.
  • translated components, parrtials, print.invoice
  • fixed a few bugs

i have a note saying i must go through invoices aswell, would like to discuss my 2 refactor issues first.

@billybonks billybonks force-pushed the translations branch 5 times, most recently from d6b93e2 to b7dbfb4 Compare June 30, 2016 11:04
@billybonks billybonks force-pushed the translations branch 2 times, most recently from d2feeb1 to 657bd9d Compare July 4, 2016 21:33
@billybonks billybonks force-pushed the translations branch 2 times, most recently from 10392d4 to 54e347a Compare July 6, 2016 19:55
@jkleinsc
Copy link
Member

jkleinsc commented Jul 7, 2016

@billybonks -- one thing I realized is that invoices has some hospital specific information in it. Specifically these labels:

  • print: {
  • invoice: {
  •  hospital_name: 'TEBOW CURE HOSPITAL',
    
  •  hospital_address: 'J.P. Laurel Ave. corner Banawe St. Brgy Aquino Davao City, Philippines',
    
  •  hospital_contact: 'Telephone: (082) 300-5345    Email: [email protected]',
    
  •  hospital_footer: 'Certified Correct by: Leron L. Lehman- Executive Director',
    

I don't think we should add them to the translations file and I am thinking for now maybe we just completely remove this text from the input.
Ideally this text is setup by an admin #419 was supposed to do this, but it never got completed.

Invoicing needs more work in general, so I don't want to spend a lot of time working around this, particularly if we are going to refactor, so I am recommending we simply remove those fields from the print template and/or throw some generic text in for now.

Additionally, "billing.labels.phil_health" should be changed to a generic label, National Insurance

@jkleinsc jkleinsc added the in progress indicates that issue/pull request is currently being worked on label Jul 7, 2016
@billybonks
Copy link
Contributor Author

@jkleinsc Updated based on your comments 👍 for now i removed all invoice changes will open a new pr for them

@jkleinsc
Copy link
Member

jkleinsc commented Jul 7, 2016

@billybonks Does that mean this PR is ready to go?

@billybonks
Copy link
Contributor Author

ye if you are happy with the code.

On Thu, Jul 7, 2016 at 5:26 PM John Kleinschmidt [email protected]
wrote:

@billybonks https://github.com/billybonks Does that mean this PR is
ready to go?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#536 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/ABkGyPgsQiiWkxU-50q6KCEg2QJyDavOks5qTRqcgaJpZM4I-nCJ
.

@jkleinsc
Copy link
Member

jkleinsc commented Jul 7, 2016

Looks good to me. I'll merge.

@jkleinsc jkleinsc merged commit b6f3402 into HospitalRun:master Jul 7, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
in progress indicates that issue/pull request is currently being worked on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants