Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Japanese translation #1275

Merged
merged 4 commits into from
Jul 24, 2018
Merged

Fix Japanese translation #1275

merged 4 commits into from
Jul 24, 2018

Conversation

horiguti
Copy link
Contributor

These are assorted patchs to fix Japanese translation on the master branch in response to a call by Dave Cramer in pgsql-translators . Plus additional cleanups of the whole Japanese translation.

This consists of the following fixes.

  • 4b350ec (2nd) Fix messages pointed by feat: Implement Statement#getObject(int, Class) without JSR-310 #813
  • 682fc4a (3rd) Fill up empty translation items. Fixes wrong translations and unifies wording. This might be better be reduced to just filling empty items and fixing apparently wrong ones.
  • d5ed902 (4th) Fix a typo in PgConnection.java and related entry in ja.po.

And to put these changes on top of, 762cd4e (1st) is ja.po update made by mvn -Ptranslate compile.

regards.

@vlsi
Copy link
Member

vlsi commented Jul 23, 2018

@horiguti , thanks for the quick update.

I've rebased your branch on top of current master, could you please recheck if it still looks good?

PS. @davecramer , we might need to review headers for po files as well: https://github.com/horiguti/pgjdbc/blob/d757321c09d773bfd21d572e22e126a36a19b489/pgjdbc/src/main/java/org/postgresql/translation/ja.po#L1-L3

msgid "Unsupported type conversion to {1}."
msgstr "サポートされないバイナリエンコーディングです: {0}."
msgstr "{1} への型変換はサポートされていません。"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we have off-by-one errors like

throw new PSQLException(GT.tr("Unsupported type conversion to {1}.", type),

Arguments are 0-indexed, so it should be {0}.

I think we can handle those issues later (and update po files accordingly)

@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (master@21e126f). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #1275   +/-   ##
=========================================
  Coverage          ?   68.76%           
  Complexity        ?     3855           
=========================================
  Files             ?      174           
  Lines             ?    16029           
  Branches          ?     2612           
=========================================
  Hits              ?    11023           
  Misses            ?     3775           
  Partials          ?     1231

@davecramer
Copy link
Member

@horiguti Thanks so much for this!
@vlsi yes, apparently some C&P errors exist

@horiguti
Copy link
Contributor Author

(I'm not falimiar to this interface so replying here at once)

Sorry for the careless change of permission bits. (It's due to samba's setting).

@vlsi> I've rebased your branch on top of current master, could you please recheck if it still looks good?

I reviewed rebased file and found one difference at line 1608 (tried to call end..) which just changes line splitting position. In short, it looks still fine.

Thanks.

@vlsi
Copy link
Member

vlsi commented Jul 24, 2018

just changes line splitting position

Yeah, that is one more "feature" of gettext that we cannot influence (there's --no-wrap command line option, however it just does not work)

I'll add a script to pgjdbc that would join multiline strings to a single line.

@vlsi vlsi added this to the 42.3.0 milestone Jul 24, 2018
@vlsi vlsi added this to In progress in 42.3.0 Release via automation Jul 24, 2018
@vlsi vlsi merged commit 993a3be into pgjdbc:master Jul 24, 2018
42.3.0 Release automation moved this from In progress to Done Jul 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants