Merge branch 'release/v1.0.5'

Author: Kolya Korobochkin

Gruntfile.js

@@ -1,58 +1,36 @@
 module.exports = function (grunt) {
+	'use strict';
+
+	// Force use of Unix newlines
+	grunt.util.linefeed = '\n';
 
 	grunt.initConfig ({
 		pkg: grunt.file.readJSON ('package.json'),
 
-		po2mo: {
-			languages: {
-				src: 'plugin/languages/*.po',
-				expand: true,
-			},
-		},
-		potomo: {
-			dev: {
-				options: {
-					poDel: false,
-				},
-				files: [{
-					expand: true,
-					cwd: 'plugin/languages/',
-					src: ['*.po'],
-					dest: 'plugin/languages/',
-					ext: '.mo',
-					nonull: true,
-				}],
-			},
-		},
 		compress: {
-			dist: {
+			plugin: {
 				options: {
-					archive: 'dist/<%= pkg.name %>.zip',
+					archive: 'dist/<%= pkg.name %>.<%= pkg.version %>.zip',
 					mode: 'zip',
-					pretty: true,
+					pretty: true
 				},
 				files: [
 					{
 						expand: true,
 						cwd: 'plugin/',
 						src: '**',
 						dest: '<%= pkg.name %>/',
-						dot: false,
-					},
-				],
-			},
-		},
+						dot: false
+					}
+				]
+			}
+		}
 	});
 
-	grunt.loadNpmTasks ('grunt-po2mo');
-	grunt.loadNpmTasks ('grunt-potomo');
-	grunt.loadNpmTasks ('grunt-contrib-compress');
+	require('load-grunt-tasks')(grunt, { scope: 'devDependencies' });
 
-	grunt.registerTask ('default',
-		[
-			'po2mo:languages',
-			'compress:dist'
-		]
-	);
+	grunt.registerTask('default', [
+		'compress:plugin'
+	]);
 
 };

README.md

@@ -1,18 +1,21 @@
-bbPress Permalinks with ID
-==========================
+# bbPress Permalinks with ID
 
-Change bbPress permalinks. Topic and forum ID instead of slug.
+Stable version on WordPress.org — [wordpress.org/plugins/bbpress-permalinks-with-id/](https://wordpress.org/plugins/bbpress-permalinks-with-id/).
 
 This plugin for WordPress and bbPress converts default permalinks with topic and forum slugs to permalinks with ID's. Examples:
 
  * /forums/forum/FORUM_SLUG → /forums/forum/FORUM_ID
  * /forums/topic/TOPIC_SLUG → /forums/topic/TOPIC_ID
 
-Real examples:
- * site.com/forums/forum/1/
- * site.com/forums/topic/2/
-
 ## Create a .zip plugin for WordPress
-To compile dist just hit npm install and then run grunt default task (working plugin in .zip archive will be created at dist/ folder).
 
-Photo on banner created by [Jay Mantri](https://stocksnap.io/photo/BD7R33PKME).
+To create working .zip-plugin just hit `npm install` and then run `grunt` default task (working plugin in .zip archive will be created at `dist` folder).
+
+```
+npm install
+grunt
+```
+
+## Credits
+
+Photo on banner created by [Jay Mantri](https://stocksnap.io/photo/BD7R33PKME).

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "bbPress-permalinks-with-id",
+  "name": "bbpress-permalinks-with-id",
   "version": "1.0.4",
   "description": "Change bbPress permalinks. ID number instead of topic slug.",
-  "main": "plugin/plugin.php",
+  "main": "Gruntfile.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/korobochkin/bbPress-permalinks-with-id.git"
@@ -15,15 +15,14 @@
     "WordPress"
   ],
   "author": "Kolya Korobochkin",
-  "license": "MIT",
+  "license": "GPL-2.0+",
   "bugs": {
     "url": "https://github.com/korobochkin/bbPress-permalinks-with-id/issues"
   },
   "homepage": "https://github.com/korobochkin/bbPress-permalinks-with-id",
   "devDependencies": {
     "grunt": "latest",
-    "grunt-po2mo": "latest",
     "grunt-contrib-compress": "latest",
-    "grunt-potomo": "latest"
+    "load-grunt-tasks": "^3.4.1"
   }
 }

plugin/languages/additional.php

@@ -1,15 +1,15 @@
 <?php
 /**
  * Plugin Name: bbPress Permalinks with ID
- * Plugin URI: http://korobochkin.com/
+ * Plugin URI: https://wordpress.org/plugins/bbpress-permalinks-with-id/
  * Description: ID instead of slug in bbPress topic and forum links.
  * Author: Kolya Korobochkin
  * Author URI: http://korobochkin.com/
- * Version: 1.0.4
- * Text Domain: bbpress_permalinks
+ * Version: 1.0.5
+ * Text Domain: bbpress-permalinks-with-id
  * Domain Path: /languages/
  * Requires at least: 4.1.1
- * Tested up to: 4.2.1
+ * Tested up to: 4.5.0
  * License: GPLv2 or later
  */
 

plugin/languages/bbpress-permalinks-ru_RU.mo

@@ -3,8 +3,8 @@ Contributors: korobochkin
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=me%40korobochkin%2ecom&item_name=bbPress%20Permalinks%20with%20ID&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted
 Tags: bbpress, permalinks, links, url, rewrite rule, id, forums, topics, slugs, characters
 Requires at least: 4.1.1
-Tested up to: 4.2.1
-Stable tag: 1.0.4
+Tested up to: 4.5.0
+Stable tag: 1.0.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -62,10 +62,20 @@ Simply adds few rewrite rules. If you deactivate or remove plugin and after that
 
 == Changelog ==
 
+= 1.0.5 =
+
+Update plugin text domain.
+
 = 1.0.4 =
-* First version of plugin for wordpress.org. Without automaticly flushing rewrite rules.
+
+First version of plugin for wordpress.org. Without automatically flushing rewrite rules.
 
 == Upgrade Notice ==
 
+= 1.0.5 =
+
+Update plugin text domain.
+
 = 1.0.4 =
+
 Basic functionality of plugin.