Merge pull request #1789 from ampproject/improve/i18n

Eliminate obsolete i18n code

.gitignore

@@ -5,6 +5,4 @@ node_modules
 wiki
 amp.zip
 **/*-compiled.js
-languages/*.pot
-languages/*.php
 built

.travis.yml

@@ -55,13 +55,6 @@ jobs:
       env: WP_VERSION=latest DEV_LIB_ONLY=composer,grunt
       script:
         - |
-          if ! command -v wp >/dev/null 2>&1; then
-            mkdir -p /tmp/wp-cli
-            wget -O /tmp/wp-cli/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-            chmod +x /tmp/wp-cli/wp
-            export PATH="/tmp/wp-cli:$PATH"
-            wp cli update --yes --nightly # Temporary until WP-CLI 2.1 or 2.0.1
-          fi
           eval "$(ssh-agent -s)"
           pantheon_branch=$( echo $TRAVIS_BRANCH | sed 's/^\([0-9]\)/v\1/' | sed 's/[^a-z0-9-]/-/' )
           echo "Initializing deployment to Pantheon branch: $pantheon_branch"

Gruntfile.js

@@ -34,12 +34,6 @@ module.exports = function( grunt ) {
 			webpack_production: {
 				command: 'cross-env BABEL_ENV=production webpack'
 			},
-			pot_to_php: {
-				command: 'npm run pot-to-php && php -l languages/amp-translations.php'
-			},
-			makepot: {
-				command: 'wp i18n make-pot . languages/amp-js.pot --include="*.js" --file-comment="*/null/*"' // The --file-comment is a temporary workaround for <https://github.com/ampproject/amp-wp/issues/1416>.
-			},
 			create_build_zip: {
 				command: 'if [ ! -e build ]; then echo "Run grunt build first."; exit 1; fi; if [ -e amp.zip ]; then rm amp.zip; fi; cd build; zip -r ../amp.zip .; cd ..; echo; echo "ZIP of build: $(pwd)/amp.zip"'
 			}
@@ -80,8 +74,6 @@ module.exports = function( grunt ) {
 		stdout = [];
 
 		grunt.task.run( 'shell:webpack_production' );
-		grunt.task.run( 'shell:makepot' );
-		grunt.task.run( 'shell:pot_to_php' );
 
 		spawnQueue.push(
 			{
@@ -101,13 +93,12 @@ module.exports = function( grunt ) {
 			versionAppend = new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' ) + '-' + commitHash;
 
 			paths = lsOutput.trim().split( /\n/ ).filter( function( file ) {
-				return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|dev-lib|readme\.md|composer\..*|webpack.*|languages\/README.*)/.test( file );
+				return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|dev-lib|readme\.md|composer\..*|webpack.*)/.test( file );
 			} );
 			paths.push( 'vendor/autoload.php' );
 			paths.push( 'assets/js/*-compiled.js' );
 			paths.push( 'vendor/composer/**' );
 			paths.push( 'vendor/sabberworm/php-css-parser/lib/**' );
-			paths.push( 'languages/amp-translations.php' );
 
 			grunt.task.run( 'clean' );
 			grunt.config.set( 'copy', {

assets/js/amp-block-validation.js

@@ -212,6 +212,7 @@ var ampBlockValidation = ( function() { // eslint-disable-line no-unused-vars
 				blockErrorCount = validationErrors.length - blockValidationErrors.other.length;
 				if ( blockErrorCount > 0 ) {
 					noticeMessage += ' ' + wp.i18n.sprintf(
+						/* translators: %s is the count of block errors. */
 						wp.i18n._n(
 							'And %s is directly due to content here.',
 							'And %s are directly due to content here.',

contributing.md

@@ -138,7 +138,7 @@ When you push a commit to your PR, Travis CI will run the PHPUnit tests and snif
 
 Contributors who want to make a new release, follow these steps:
 
-0. Do `git submodule update --init --recursive && npm install && composer selfupdate && composer install && wp cli update`.
+0. Do `git submodule update --init --recursive && npm install && composer selfupdate && composer install`.
 1. Bump plugin versions in `amp.php` (×2: the metadata block in the header and also the `AMP__VERSION` constant). Verify via `npx grunt shell:verify_matching_versions`.
 2. Add changelog entry to readme.
 3. Do `npm run build` and install the `amp.zip` onto a normal WordPress install running a stable release build; do smoke test to ensure it works.

package.json

@@ -30,7 +30,6 @@
  },
  "main": "blocks/index.js",
  "scripts": {
-  "pot-to-php": "pot-to-php languages/amp-js.pot languages/amp-translations.php amp",
   "build": "grunt build && grunt create-build-zip",
   "deploy": "grunt deploy",
   "dev": "cross-env BABEL_ENV=default webpack --watch"