Internationalisation fixes #1088

johnbillion · 2016-08-04T15:12:18Z

See the individual commit messages for explanations of the changes.

…le. Maintains late escaping discipline.

codecov-io · 2016-08-04T15:17:51Z

Codecov Report

Merging #1088 into master will decrease coverage by 6.24%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #1088      +/-   ##
==========================================
- Coverage   32.05%   25.81%   -6.25%     
==========================================
  Files          31       31              
  Lines        2561     3653    +1092     
==========================================
+ Hits          821      943     +122     
- Misses       1740     2710     +970

Impacted Files	Coverage Δ
classes/class-email-service.php	`0% <0%> (ø)`	⬆️
.../backup/class-backup-engine-database-mysqldump.php	`78.78% <0%> (-7.18%)`	⬇️
...es/backup/class-backup-engine-file-zip-archive.php	`79.16% <0%> (-4.17%)`	⬇️
...backup/class-backup-engine-database-imysqldump.php	`82.6% <0%> (-3.11%)`	⬇️
classes/backup/class-backup-engine-file-zip.php	`78.12% <0%> (-2.65%)`	⬇️
classes/backup/class-backup.php	`71.17% <0%> (-2.4%)`	⬇️
classes/backup/class-backup-engine-database.php	`87.27% <0%> (-2.32%)`	⬇️
classes/class-scheduled-backup.php	`46.34% <0%> (-2.25%)`	⬇️
functions/core.php	`20.19% <0%> (-1.85%)`	⬇️
classes/class-path.php	`86.36% <0%> (-1.84%)`	⬇️
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update beb970c...d1a87b5. Read the comment docs.

dashaluna · 2016-08-04T15:23:17Z

admin/constants.php

+		__( 'You can define any of the following constants in your %1$s file to control advanced settings. <a href="%2$s">The Codex can help</a>. Defined constants will be highlighted.', 'backupwordpress' ),
+		'<code>wp-config.php</code>',
+		'https://codex.wordpress.org/Editing_wp-config.php'
+	); ?></p>


@johnbillion is there a reason why these aren't escaped?

Escaping translations is something that I personally recommend strongly, but isn't strictly necessary. I think BWP should escape all of its translations, but that's something that would be better one all at once, and separately from these other enhancements.

dashaluna · 2016-08-05T08:03:47Z

classes/class-email-service.php

+					esc_html__( 'If the errors above look like Martian, forward this email to %3$s and we\'ll take a look', 'backupwordpress' ) . "\n\n" .
+					home_url(),
+					$error_message,
+					'[email protected]'


@johnbillion I wanted to make this one string, but then how would I deal with \n\n? Just add them like that in the string? There are few vars like this in this file. Are they ok to be merged into one string?

I think this is ok as separate strings with "\n\n" concatenating them.

home_url() needs to be escaped. Is $error_message safe? This whole string should be wrapped in esc_html() instead of the individual esc_html__() usage.

dashaluna · 2016-08-05T08:34:22Z

admin/faq.php

+	 '<p>' . sprintf(
+	 	__( 'BackUpWordPress Pro supports Dropbox, Google Drive, Amazon S3, Rackspace, Azure, DreamObjects and FTP/SFTP. <a href="%s" target="_blank">Check it out at bwp.hmn.md</a>', 'backupwordpress' ),
+	 	'https://bwp.hmn.md/?utm_source=wordpress-org&utm_medium=plugin-page&utm_campaign=freeplugin'
+	 	) . '</p>' .


@pdewouters I think you've mentioned that these files have to have a specific format otherwise they won't be processed. Will it cope if we use sprintf() and esc_html__() ?

willmot · 2016-11-04T15:12:08Z

@Dasha are you still working on this? Any idea when it might be done?

mikeselander · 2017-01-11T10:55:14Z

Since this overlays #1090 so closely, I think we could probably work on this one after that gets merged. It is quite stale but could be re-picked up.

dashaluna · 2017-08-30T11:17:37Z

Wow, not quite sure why it wasn't merged before as it was in pretty good state. Not sure how to better approach this now as things still need fixing.

dashaluna · 2017-08-30T13:15:45Z

I'm picking this up.

dashaluna · 2017-08-30T13:19:45Z

classes/class-email-service.php

+						esc_url( home_url() ),
+						$error_message,
+						'[email protected]'
+				);


@johnbillion How does this look? Addressing your feedback that the whole message should be a one string. Ref 93c7a40#r75849252

…breaks in double quotes

dashaluna · 2017-08-31T10:11:25Z

Right, let's do a final push on this one :) Can someone review please?
/cc @willmot

jazzsequence

LGTM, although the tabbing in a couple places looked weird.

jazzsequence · 2017-08-31T19:31:01Z

classes/class-email-service.php

+						esc_html__(
+								'BackUpWordPress was unable to backup your site %1$s.' . "\n\n" .
+								'Here are the errors that we\'ve encountered: %2$s' . "\n\n" .
+								'If the errors above look like Martian, forward this email to %3$s and we\'ll take a look.' . "\n\n", 'backupwordpress' ),


tabbing here is weird

jazzsequence · 2017-08-31T19:31:27Z

classes/class-email-service.php

+							'BackUpWordPress has completed a backup of your site %1$s'. "\n\n" .
+							'The backup file should be attached to this email.' . "\n\n" .
+							'You can download the backup file by clicking the link below:' . "\n\n" . '%2$s' . "\n\n" .
+							'Kind Regards,\nThe Happy BackUpWordPress Backup Emailing Robot', 'backupwordpress' ),


Tabbing here is also weird.

jazzsequence · 2017-08-31T19:31:36Z

classes/class-email-service.php

+							'BackUpWordPress has completed a backup of your site %1$s' . "\n\n" .
+							'Unfortunately, the backup file was too large to attach to this email.' . "\n\n" .
+							'You can download the backup file by clicking the link below:' . "\n\n" . '%2$s' . "\n\n" .
+							'Kind Regards,\nThe Happy BackUpWordPress Backup Emailing Robot', 'backupwordpress' ),


...and here.

dashaluna · 2017-09-01T08:31:20Z

@willmot I'm not sure what the process of preparing a new version is and when to merge PRs. But this is ready to go in 👍

willmot · 2017-09-05T13:23:54Z

@pdewouters any availability to handle review/merge and release?

dashaluna · 2017-09-20T09:41:48Z

@pdewouters pinging about this one :)

johnbillion added 8 commits August 4, 2016 16:01

Improved sentence structure for various localised strings.

d15e7ce

Echo the text directly instead of unnecessarily assigning to a variab…

3f87b15

…le. Maintains late escaping discipline.

Add some missing escaping.

aa294c2

Add some missing i18n.

9c6efb7

Correct a typo.

65501d5

Correct some mis-used i18n function usage.

fda22db

Escape once instead of thrice.

2f1f5da

Weekday names are provided by WP_Locale.

538624c

johnbillion added Enhancement Review & Merge labels Aug 4, 2016

johnbillion assigned dashaluna Aug 4, 2016

dashaluna reviewed Aug 4, 2016
View reviewed changes

Add escaping to translations

93c7a40

dashaluna reviewed Aug 5, 2016
View reviewed changes

Add escaping to translations

22515c6

dashaluna reviewed Aug 5, 2016
View reviewed changes

dashaluna added the Do Not Merge label Sep 23, 2016

mikeselander added In Progress and removed Review & Merge labels Jan 11, 2017

pdewouters assigned pdewouters and unassigned dashaluna Feb 16, 2017

Merge in latest master and fix conflicts

30bc7ce

dashaluna assigned dashaluna and unassigned pdewouters Aug 30, 2017

dashaluna added 2 commits August 30, 2017 13:31

Remove redundant new lines (introed after merge)

35c8c61

Fix translations in email services

fe8b6f2

dashaluna reviewed Aug 30, 2017

View reviewed changes

dashaluna mentioned this pull request Aug 30, 2017

Remove plugin's text domain from generic strings #1183

Open

dashaluna removed the Do Not Merge label Aug 31, 2017

Unify email notification format for translation - always append line …

7199380

…breaks in double quotes

dashaluna added Reviewer needed and removed In Progress labels Aug 31, 2017

pdewouters removed the Reviewer needed label Aug 31, 2017

pdewouters requested a review from jazzsequence August 31, 2017 19:25

jazzsequence approved these changes Aug 31, 2017

View reviewed changes

Fix spacing in class-email-service around email messages code

d1a87b5

dashaluna added the Ready for Release label Sep 20, 2017

InfiniteLove2020 approved these changes Jul 10, 2020

View reviewed changes

johnbillion closed this Dec 11, 2021

Internationalisation fixes #1088

Internationalisation fixes #1088

Uh oh!

Conversation

johnbillion commented Aug 4, 2016

Uh oh!

codecov-io commented Aug 4, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dashaluna Aug 5, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

willmot commented Nov 4, 2016

Uh oh!

mikeselander commented Jan 11, 2017

Uh oh!

dashaluna commented Aug 30, 2017

Uh oh!

dashaluna commented Aug 30, 2017

Uh oh!

dashaluna Aug 30, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dashaluna commented Aug 31, 2017

Uh oh!

jazzsequence left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dashaluna commented Sep 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

willmot commented Sep 5, 2017

Uh oh!

dashaluna commented Sep 20, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov-io commented Aug 4, 2016 •

edited

Loading

dashaluna Aug 5, 2016 •

edited

Loading

dashaluna Aug 30, 2017 •

edited

Loading

dashaluna commented Sep 1, 2017 •

edited

Loading