Skip to content

Conversation

@renoirb
Copy link
Contributor

@renoirb renoirb commented Sep 18, 2025

Description

Both files are essentially the same, other than one word or the other.

(This is also just a quick stub to discuss what other expectations in commit and PR documentation going)

PS: I'm deliberately not proposing to have one file with everything and another with much less. It's been about 7 years I haven't written PHP, and in this context, WordPress has different ways of working and expectations that I need to re-familiarize myself with.

Goal

Make the difference between files only the meaningful ones

red (with <, the "left side" in the diff) below is for app-download.php, green is on the right side

diff app-download.php app-map.php 
3c3
<  * Template Name: fw-child/apps/app-download.php
---
>  * Template Name: fw-child/apps/app-map.php
13c13
< $assets = cdc_app_asset_load( 'download' );
---
> $assets = cdc_app_asset_load( 'map' );
31a32
> 
33a35,43
> 
> 	'about-data-en' => '/about/our-data/',
> 	'about-data-fr' => '/le-portail/nos-donnees/',
> 
> 	'support-en' => '/feedback/',
> 	'support-fr' => '/retroaction/',
> 
> 	'download-en' => '/download/',
> 	'download-fr' => '/telechargement/',
66a77,79
>         // URL encoder salt for the app
>         window.URL_ENCODER_SALT = '<?php echo isset( $GLOBALS['vars']['url_encoder_salt'] ) ? htmlspecialchars( $GLOBALS['vars']['url_encoder_salt'], ENT_QUOTES, 'UTF-8' ) : ''; ?>';
> 

Related ticket

@renoirb renoirb self-assigned this Sep 18, 2025
@renoirb renoirb marked this pull request as ready for review September 24, 2025 19:15
@renoirb renoirb force-pushed the make-app-files-the-same branch from 899b619 to 5f407ab Compare September 24, 2025 19:26
@renoirb renoirb changed the title Make both app-download.php and app-maps.php be the same make both fw-child/apps/app-download.php and app-map.php to have only code as differencess Sep 26, 2025
@renoirb renoirb changed the title make both fw-child/apps/app-download.php and app-map.php to have only code as differencess make both fw-child/apps/app-download.php and app-map.php to have only code as differences Sep 26, 2025
@renoirb renoirb force-pushed the make-app-files-the-same branch from 5f407ab to 6f4f832 Compare October 14, 2025 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants