Skip to content

Commit 11eff15

Browse files
add polish
1 parent 1063357 commit 11eff15

27 files changed

+4866
-464
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,5 @@ wiki/pt_BR/_build
8585
build/ApplicationBuild.js
8686
build/ApplicationPUBLIC.js
8787
wiki/generate.php
88-
script/install_8.sh
88+
script/install_18.sh
89+
script/test.sql

build/MagnusBilling-current.tar.gz

40.5 KB
Binary file not shown.

classic/src/ux/button/Locale.js

+19-14
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@
2121
Ext.define('Ext.ux.button.Locale', {
2222
extend: 'Ext.button.Split',
2323
alias: 'widget.locale',
24-
handler: function() {
24+
handler: function () {
2525
this.showMenu()
2626
},
27-
supportLang: ['pt_BR', 'en', 'es', 'fr', 'it', 'ru', 'de'],
27+
supportLang: ['pt_BR', 'en', 'es', 'fr', 'it', 'ru', 'de', 'pl'],
2828
iconCls: 'flag-' + window.lang,
29-
initComponent: function() {
29+
initComponent: function () {
3030
var me = this;
3131
me.menu = [{
32-
text: t('German'),
33-
iconCls: 'flag-de',
34-
scope: me,
35-
handler: me.setLocale
36-
}, {
3732
text: t('English'),
3833
iconCls: 'flag-en',
3934
scope: me,
@@ -43,11 +38,26 @@ Ext.define('Ext.ux.button.Locale', {
4338
iconCls: 'flag-fr',
4439
scope: me,
4540
handler: me.setLocale
41+
}, {
42+
text: t('German'),
43+
iconCls: 'flag-de',
44+
scope: me,
45+
handler: me.setLocale
4646
}, {
4747
text: t('Italian'),
4848
iconCls: 'flag-it',
4949
scope: me,
5050
handler: me.setLocale
51+
}, {
52+
text: t('Polish'),
53+
iconCls: 'flag-pl',
54+
scope: me,
55+
handler: me.setLocale
56+
}, {
57+
text: t('Portuguese'),
58+
iconCls: 'flag-pt_BR',
59+
scope: me,
60+
handler: me.setLocale
5161
}, {
5262
text: t('Russian'),
5363
iconCls: 'flag-ru',
@@ -58,15 +68,10 @@ Ext.define('Ext.ux.button.Locale', {
5868
iconCls: 'flag-es',
5969
scope: me,
6070
handler: me.setLocale
61-
}, {
62-
text: t('Portuguese'),
63-
iconCls: 'flag-pt_BR',
64-
scope: me,
65-
handler: me.setLocale
6671
}];
6772
me.callParent(arguments);
6873
},
69-
setLocale: function(item) {
74+
setLocale: function (item) {
7075
var me = this,
7176
icon = item.iconCls,
7277
lang = icon.replace('flag-', '');

classic/src/view/general/BooleanCombo.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,14 @@ Ext.define('MBilling.view.general.Typelanguage', {
212212
value: 'en',
213213
store: [
214214
['', t('Undefined')],
215-
['br', t('Portuguese')],
216215
['en', t('English')],
217-
['es', t('Spanish')],
218-
['ru', t('Russian')]
216+
['fr', t('French')],
217+
['de', t('German')],
218+
['it', t('Italian')],
219+
['pl', t('Polish')],
220+
['br', t('Portuguese')],
221+
['ru', t('Russian')],
222+
['es', t('Spanish')]
219223
]
220224
});
221225
Ext.define('MBilling.view.general.TypeCampaign', {
@@ -261,7 +265,7 @@ Ext.define('MBilling.view.general.CountryISOCombo', {
261265
forceSelection: true,
262266
editable: true,
263267
listeners: {
264-
focus: function(combo) {
268+
focus: function (combo) {
265269
combo.expand();
266270
}
267271
},
@@ -525,7 +529,7 @@ Ext.define('MBilling.view.general.CountryCombo', {
525529
editable: true,
526530
allowBlank: true,
527531
listeners: {
528-
focus: function(combo) {
532+
focus: function (combo) {
529533
combo.expand();
530534
}
531535
},

protected/commands/UpdateMysqlCommand.php

+10
Original file line numberDiff line numberDiff line change
@@ -2048,6 +2048,16 @@ public function run($args)
20482048
$version = '7.8.4.9';
20492049
$this->update($version);
20502050
}
2051+
2052+
2053+
//2025-01-06
2054+
if ($version == '7.8.4.9') {
2055+
$sql = "ALTER TABLE pkg_trunk DROP FOREIGN KEY fk_pkg_trunk_pkg_trunk";
2056+
$this->executeDB($sql);
2057+
2058+
$version = '7.8.5.0';
2059+
$this->update($version);
2060+
}
20512061
}
20522062

20532063
public function executeDB($sql)

0 commit comments

Comments
 (0)