Skip to content

Commit

Permalink
Merge branch 'release/1.2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
devAsadNur committed Jun 28, 2022
2 parents cecd376 + 077ee0b commit 1c1faff
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 27 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
**Requires at least:** 4.4
**Tested up to:** 6.0
**WC requires at least:** 3.0
**WC tested up to:** 6.5.1
**WC tested up to:** 6.6.1
**Requires PHP:** 5.6
**Stable tag:** 1.2.3
**Stable tag:** 1.2.4
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -60,6 +60,9 @@ No FAQ

## Changelog ##

### v1.2.4 -> 28 June, 2022 ###
- **Fix:** Localization issue on changing site language

### v1.2.3 -> 03 June, 2022 ###
- **Compatibility:** Compatibility for WordPress 6.0

Expand Down
4 changes: 4 additions & 0 deletions assets/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ new Vue({
},
created: function created() {
this.setLocaleData(wepos.i18n['wepos']);

if (wepos.i18n['wepos-pro']) {
this.setLocaleData(wepos.i18n['wepos-pro']);
}
}
});

Expand Down
2 changes: 1 addition & 1 deletion assets/js/admin.min.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions assets/js/frontend.js
Original file line number Diff line number Diff line change
Expand Up @@ -3127,6 +3127,10 @@ new Vue({
},
created: function created() {
this.setLocaleData(wepos.i18n['wepos']);

if (wepos.i18n['wepos-pro']) {
this.setLocaleData(wepos.i18n['wepos-pro']);
}
}
});

Expand Down
2 changes: 1 addition & 1 deletion assets/js/frontend.min.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion assets/src/admin/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ new Vue({
store,
render: h => h(App),
created() {
this.setLocaleData( wepos.i18n['wepos'] )
this.setLocaleData( wepos.i18n['wepos'] );

if ( wepos.i18n['wepos-pro'] ) {
this.setLocaleData( wepos.i18n['wepos-pro'] );
}
}
});

Expand Down
6 changes: 5 additions & 1 deletion assets/src/frontend/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ new Vue({
store,
render: h => h(App),
created() {
this.setLocaleData( wepos.i18n['wepos'] )
this.setLocaleData( wepos.i18n['wepos'] );

if ( wepos.i18n['wepos-pro'] ) {
this.setLocaleData( wepos.i18n['wepos-pro'] );
}
}
})
28 changes: 14 additions & 14 deletions languages/wepos.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# This file is distributed under the GPL2.
msgid ""
msgstr ""
"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.2.3\n"
"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.2.4\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wepos\n"
"POT-Creation-Date: 2022-06-03 09:58:21+00:00\n"
"POT-Creation-Date: 2022-06-28 05:27:26+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand All @@ -13,26 +13,26 @@ msgstr ""
"Language-Team: LANGUAGE <[email protected]>\n"
"X-Generator: wp-vue-i18n 1.1.3\n"

#: assets/js/admin.js:122 assets/js/admin.js:369 assets/js/admin.js:461
#: assets/js/admin.js:1429 assets/js/bootstrap.js:1086
#: assets/js/frontend.js:3205 assets/js/frontend.js:3387
#: assets/js/frontend.js:3471 assets/js/frontend.js:3980
#: assets/js/frontend.js:5016 assets/js/frontend.js:5183
#: assets/js/frontend.js:5288 assets/js/frontend.js:5663
#: assets/js/frontend.js:5774 assets/js/vendor.js:18166
#: assets/js/admin.js:126 assets/js/admin.js:373 assets/js/admin.js:465
#: assets/js/admin.js:1433 assets/js/bootstrap.js:1086
#: assets/js/frontend.js:3209 assets/js/frontend.js:3391
#: assets/js/frontend.js:3475 assets/js/frontend.js:3984
#: assets/js/frontend.js:5020 assets/js/frontend.js:5187
#: assets/js/frontend.js:5292 assets/js/frontend.js:5667
#: assets/js/frontend.js:5778 assets/js/vendor.js:18166
#: assets/js/vendor.js:18266 assets/js/vendor.js:27716
#: assets/js/vendor.js:28292 assets/js/vendor.js:28402
#: assets/js/vendor.js:28522 assets/js/vendor.js:28544
#: assets/js/vendor.js:28601
msgid "div"
msgstr ""

#: assets/js/admin.js:2293 assets/js/admin.min.js:1
#: assets/js/admin.js:2297 assets/js/admin.min.js:1
#: assets/src/admin/components/Settings.vue:134
msgid "Choose your file"
msgstr ""

#: assets/js/admin.js:2295 assets/js/admin.min.js:1
#: assets/js/admin.js:2299 assets/js/admin.min.js:1
#: assets/src/admin/components/Fields.vue:171
#: assets/src/admin/components/Settings.vue:136
msgid "Select"
Expand Down Expand Up @@ -142,15 +142,15 @@ msgstr ""
msgid "Please enter an email address for customer"
msgstr ""

#: assets/js/frontend.js:4950
#: assets/js/frontend.js:4954
msgid "aside"
msgstr ""

#: assets/js/frontend.js:5577
#: assets/js/frontend.js:5581
msgid "tr"
msgstr ""

#: assets/js/frontend.js:8455
#: assets/js/frontend.js:8459
msgid "td"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wepos",
"version": "1.2.3",
"version": "1.2.4",
"description": "Point of Sale plugin for WooCommerce",
"author": "weDevs <[email protected]>",
"license": "GPLv2",
Expand Down
7 changes: 5 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Tags: WooCommerce POS, point of sale, free pos, pos plugin, woocommerce point of
Requires at least: 4.4
Tested up to: 6.0
WC requires at least: 3.0
WC tested up to: 6.5.1
WC tested up to: 6.6.1
Requires PHP: 5.6
Stable tag: 1.2.3
Stable tag: 1.2.4
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -60,6 +60,9 @@ No FAQ

== Changelog ==

= v1.2.4 -> 28th June, 2022 =
- **Fix:** Localization issue on changing site language

= v1.2.3 -> 3rd June, 2022 =
- **Compatibility:** Compatibility for WordPress 6.0

Expand Down
6 changes: 3 additions & 3 deletions wepos.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
Plugin Name: wePOS - Point Of Sale (POS) for WooCommerce
Plugin URI: https://wedevs.com/wepos
Description: A beautiful and fast Point of Sale (POS) system for WooCommerce
Version: 1.2.3
Version: 1.2.4
Author: weDevs
Author URI: https://wedevs.com/
Text Domain: wepos
Domain Path: /languages
WC requires at least: 3.0
WC tested up to: 6.5.1
WC tested up to: 6.6.1
License: GPL2
License URI: https://www.gnu.org/licenses/gpl-2.0.html
*/
Expand Down Expand Up @@ -57,7 +57,7 @@ final class WePOS {
*
* @var string
*/
public $version = '1.2.3';
public $version = '1.2.4';

/**
* Holds various class instances
Expand Down

0 comments on commit 1c1faff

Please sign in to comment.