Skip to content

Commit 66e7f22

Browse files
authored
Merge pull request #308 from phpbb-extensions/release-1.0.4
Merge Release 1.0.4 Branch
2 parents 617b119 + f439d64 commit 66e7f22

17 files changed

+808
-34
lines changed

CHANGELOG.md

Lines changed: 48 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,61 @@
11
# Changelog
22

3+
## 1.0.4 - 2016-12-02
4+
5+
- Fixed some rare cases where errors caused a blank page. They are now caught, resulting in a proper error message.
6+
- Fixed some missing language keys in rare error messages from the nestedset class.
7+
- Fixed an issue in the ACP where the "Rule parent" field would not retain its value when previewing a rule or getting an warning message.
8+
- Fixed an issue where the AJAX processing indicator was not displaying in the ACP when moving rules up/down.
9+
- Ensure compatibility with Symfony in future phpBB releases.
10+
- Major code improvements and optimisations.
11+
- Language packs added:
12+
- Brazilian-Portuguese
13+
- Bulgarian
14+
- Norwegian
15+
- Slovak
16+
317
## 1.0.3 - 2016-01-17
418

5-
- The same anchor names can now be shared between languages
6-
- Fixed an issue that prevented rules from being updated on MSSQL systems
7-
- Added German (Formal Honorifics) language pack
8-
- Added Mandarin Chinese (Simplified Script) language pack
19+
- The same anchor names can now be shared between languages.
20+
- Fixed an issue that prevented rules from being updated on MSSQL systems.
21+
- Language packs added:
22+
- German (Formal Honorifics)
23+
- Mandarin Chinese (Simplified Script)
924

1025
## 1.0.2 - 2015-05-24
1126

12-
- Fixed an issue where postgreSQL and mssql dbms could not save rules with more than 4,000 characters
13-
- Added a new template var `S_BOARD_RULES` that styles can use when viewing the rules page
14-
- Added a table header to the rule lists in the ACP (visual improvement)
15-
- Coding improvements
16-
- Added Arabic language pack
17-
- Added Croatian language pack
18-
- Added Czech language pack
19-
- Added German language pack
20-
- Added Greek language pack
21-
- Added Hebrew language pack
22-
- Added Italian language pack
23-
- Added Polish language pack
24-
- Added Portuguese language pack
25-
- Added Romanian language pack
26-
- Added Russian language pack
27-
- Added Swedish language pack
28-
- Added Turkish language pack
29-
- Require phpBB 3.1.3 or newer
27+
- Fixed an issue where postgreSQL and MSSQL dbms could not save rules with more than 4,000 characters.
28+
- Added a new template var `S_BOARD_RULES` that styles can use when viewing the rules page.
29+
- Added a table header to the rule lists in the ACP (visual improvement).
30+
- Coding improvements.
31+
- Language packs added:
32+
- Arabic
33+
- Croatian
34+
- Czech
35+
- German
36+
- Greek
37+
- Hebrew
38+
- Italian
39+
- Polish
40+
- Portuguese
41+
- Romanian
42+
- Russian
43+
- Swedish
44+
- Turkish
45+
- Require phpBB 3.1.3 or newer.
3046

3147
## 1.0.1 - 2014-11-03
3248

33-
- Fixed an issue where rules could not be deleted with phpBB 3.1.1
34-
- Fixed an issue where rules could not be created on postgreSQL databases
35-
- Allow rule parents to be changed when adding/editing rules
36-
- Hide the rule message editor when editing a rule category
37-
- Remove the Reset button from rule editing forms
38-
- Added Spanish language pack
39-
- Added French language pack
40-
- Added Dutch language pack
41-
- Added Estonian language pack
49+
- Fixed an issue where rules could not be deleted with phpBB 3.1.1.
50+
- Fixed an issue where rules could not be created on postgreSQL databases.
51+
- Allow rule parents to be changed when adding/editing rules.
52+
- Hide the rule message editor when editing a rule category.
53+
- Remove the Reset button from rule editing forms.
54+
- Language packs added:
55+
- Spanish
56+
- French
57+
- Dutch
58+
- Estonian
4259

4360
## 1.0.0 - 2014-10-22
4461

adm/style/boardrules_manage.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ <h1>{L_ACP_BOARDRULES_MANAGE}</h1>
153153
</td>
154154
<td class="actions">
155155
<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
156-
<span class="up"><a href="{rules.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
156+
<span class="up"><a href="{rules.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
157157
<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
158-
<span class="down"><a href="{rules.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
158+
<span class="down"><a href="{rules.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
159159
<a href="{rules.U_EDIT}">{ICON_EDIT}</a>
160160
<a href="{rules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
161161
</td>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "phpbb-extension",
44
"description": "An extension which allows you to create a set of rules for your phpBB forum",
55
"homepage": "https://www.phpbb.com",
6-
"version": "1.0.4-dev",
6+
"version": "1.0.4",
77
"keywords": ["phpbb", "extension", "rules"],
88
"license": "GPL-2.0",
99
"authors": [

language/nb/boardrules_acp.php

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?php
2+
/**
3+
*
4+
* Board Rules extension for the phpBB Forum Software package.
5+
* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
6+
*
7+
* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
8+
* @license GNU General Public License, version 2 (GPL-2.0)
9+
*
10+
*/
11+
12+
/**
13+
* DO NOT CHANGE
14+
*/
15+
if (!defined('IN_PHPBB'))
16+
{
17+
exit;
18+
}
19+
20+
if (empty($lang) || !is_array($lang))
21+
{
22+
$lang = array();
23+
}
24+
25+
// DEVELOPERS PLEASE NOTE
26+
//
27+
// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
28+
//
29+
// Placeholders can now contain order information, e.g. instead of
30+
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
31+
// translators to re-order the output of data while ensuring it remains correct
32+
//
33+
// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
34+
// equally where a string contains only two placeholders which are used to wrap text
35+
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
36+
//
37+
// Some characters you may want to copy&paste:
38+
// ’ » “ ” …
39+
//
40+
41+
$lang = array_merge($lang, array(
42+
// Settings page
43+
'ACP_BOARDRULES' => 'Forumregler',
44+
'ACP_BOARDRULES_SETTINGS' => 'Innstillinger for forumregler',
45+
'ACP_BOARDRULES_SETTINGS_EXPLAIN' => 'Her kan du endre innstillingene for forumregler.',
46+
'ACP_BOARDRULES_ENABLE' => 'Aktiver forumregler',
47+
'ACP_BOARDRULES_HEADER_LINK' => 'Vis en lenke til forumreglene i toppen av siden',
48+
'ACP_BOARDRULES_AT_REGISTRATION' => 'Tving nye brukere til å akseptere reglene under registreringen',
49+
'ACP_BOARDRULES_AT_REGISTRATION_EXPLAIN'=> 'Denna instillingen legger till et punkt i vilkårene som krever at nye brukere leser og aksepterer forumreglene ila. registreringen.',
50+
'ACP_BOARDRULES_NOTIFY' => 'Send melding til brukerne',
51+
'ACP_BOARDRULES_NOTIFY_EXPLAIN' => 'Sendere en melding til alle registrerte brukere om at forumreglene har blitt oppdatert (dette kan ta noe tid).',
52+
'ACP_BOARDRULES_NOTIFY_CONFIRM' => 'Er du sikker på at du vil sende en melding til alle brukere?',
53+
'ACP_BOARDRULES_SETTINGS_CHANGED' => 'Innstillingene for forumreglene har blitt endret.',
54+
55+
// Manage page
56+
'ACP_BOARDRULES_MANAGE' => 'Behandle regler',
57+
'ACP_BOARDRULES_MANAGE_EXPLAIN' => 'På denne siden kan du opprette, oppdatere, slette og omorganisere kategorier og regler. En kategori er en gruppe av lignende regler. Hver kategori kan inneholde et ubegrenset antall regler.',
58+
'ACP_BOARDRULES_CATEGORY' => 'Regelkategori',
59+
'ACP_BOARDRULES_RULE' => 'Regel',
60+
'ACP_BOARDRULES_SELECT_LANGUAGE' => 'Velg språk',
61+
'ACP_BOARDRULES_CREATE_RULE' => 'Opprett regel',
62+
'ACP_BOARDRULES_CREATE_RULE_EXPLAIN' => 'Bruk skjemaet under for å opprettte en ny regel som skal vises til brukerne.',
63+
'ACP_BOARDRULES_EDIT_RULE' => 'Oppdater regel',
64+
'ACP_BOARDRULES_EDIT_RULE_EXPLAIN' => 'Bruk skjemaet under for å oppdatere en eksistrende regel som skal vises til brukerne.',
65+
'ACP_RULE_SETTINGS' => 'Regelinnstillinger',
66+
'ACP_RULE_PARENT' => 'Overordnet regel',
67+
'ACP_RULE_NO_PARENT' => 'Ingen overordnet',
68+
'ACP_RULE_TITLE' => 'Regeltittel',
69+
'ACP_RULE_TITLE_EXPLAIN' => 'Regeltitler vises kun på kategorienes regelside. Regeltitlene brukes til å identifisere og håndtere reglene i administrasjonskontrollpanelet.',
70+
'ACP_RULE_ANCHOR' => 'Regelanker',
71+
'ACP_RULE_ANCHOR_EXPLAIN' => 'Regelanker er valgritt og brukes som lenkeanker på regelsiden. De bør være URL-vennlige (uten mellomrom eller spesialtegn), bør begynne med en bokstav og må være unike.',
72+
'ACP_RULE_MESSAGE' => 'Regelmelding',
73+
'ACP_RULE_MESSAGE_EXPLAIN' => 'Regelmeldingen vises på regelsiden for hver regel. (Kategorier viser ikke regelmeldinger.)',
74+
'ACP_RULE_MESSAGE_DISABLED' => 'Denne kategorien inneholder regler. Meldingsredigering har blitt deaktivert.',
75+
'ACP_ADD_RULE' => 'Opprett en ny regel',
76+
'ACP_DELETE_RULE_CONFIRM' => 'Er du sikker på at du vil slette denne regelen?<br />Advarsel: Hvis en regelkategori blir slettet, slettes også alle reglene i den.',
77+
'ACP_RULE_ADDED' => 'Regelen har blitt opprettet.',
78+
'ACP_RULE_DELETED' => 'Regelen har blitt slettet.',
79+
'ACP_RULE_EDITED' => 'Regelen har blitt oppdatert.',
80+
'ACP_RULE_TITLE_EMPTY' => 'Du må angi en tittel for denne regelen.',
81+
82+
// Nested set exception messages (only appears in PHP error logging)
83+
// Translators: Feel free to not translate these language strings
84+
'RULES_NESTEDSET_LOCK_FAILED_ACQUIRE' => 'Board rules failed to acquire the table lock. Another process may be holding the lock. Locks are forcibly released after a timeout of 1 hour.',
85+
'RULES_NESTEDSET_INVALID_ITEM' => 'The requested rule does not exist.',
86+
'RULES_NESTEDSET_INVALID_PARENT' => 'The requested rule has no parent.',
87+
));

language/nb/boardrules_common.php

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
/**
3+
*
4+
* Board Rules extension for the phpBB Forum Software package.
5+
* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
6+
*
7+
* @copyright (c) 2013 phpBB Limited <https://www.phpbb.com>
8+
* @license GNU General Public License, version 2 (GPL-2.0)
9+
*
10+
*/
11+
12+
/**
13+
* DO NOT CHANGE
14+
*/
15+
if (!defined('IN_PHPBB'))
16+
{
17+
exit;
18+
}
19+
20+
if (empty($lang) || !is_array($lang))
21+
{
22+
$lang = array();
23+
}
24+
25+
// DEVELOPERS PLEASE NOTE
26+
//
27+
// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
28+
//
29+
// Placeholders can now contain order information, e.g. instead of
30+
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
31+
// translators to re-order the output of data while ensuring it remains correct
32+
//
33+
// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
34+
// equally where a string contains only two placeholders which are used to wrap text
35+
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
36+
//
37+
// Some characters you may want to copy&paste:
38+
// ’ » “ ” …
39+
//
40+
41+
$lang = array_merge($lang, array(
42+
'BOARDRULES' => 'Regler',
43+
'BOARDRULES_TITLE' => 'Vis forumets regler',
44+
'BOARDRULES_AGREEMENT' => 'Du aksepterer å følge forumets regler',
45+
'BOARDRULES_VIEWONLINE' => 'Se forumregler',
46+
'BOARDRULES_NOTIFICATION' => 'Forumets regler har blitt oppdatert. Klikk her for å lese dem.',
47+
));
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
/**
3+
*
4+
* Board Rules extension for the phpBB Forum Software package.
5+
* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
6+
*
7+
* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
8+
* @license GNU General Public License, version 2 (GPL-2.0)
9+
*
10+
*/
11+
12+
/**
13+
* DO NOT CHANGE
14+
*/
15+
if (!defined('IN_PHPBB'))
16+
{
17+
exit;
18+
}
19+
20+
if (empty($lang) || !is_array($lang))
21+
{
22+
$lang = array();
23+
}
24+
25+
// DEVELOPERS PLEASE NOTE
26+
//
27+
// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
28+
//
29+
// Placeholders can now contain order information, e.g. instead of
30+
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
31+
// translators to re-order the output of data while ensuring it remains correct
32+
//
33+
// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
34+
// equally where a string contains only two placeholders which are used to wrap text
35+
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
36+
//
37+
// Some characters you may want to copy&paste:
38+
// ’ » “ ” …
39+
//
40+
41+
$lang = array_merge($lang, array(
42+
'BOARDRULES_HEADER' => 'Forumregler',
43+
'BOARDRULES_EXPLAIN' => 'Disse reglene er nedfelt for å klargjøre brukernes ansvar og rammer for akseptabel bruk av %s, for at forumet skal bli et trivelig og givende sted for alle brukere.',
44+
'BOARDRULES_CATEGORIES' => 'Regelavsnitt',
45+
'BOARDRULES_CATEGORY_ANCHOR'=> 'avsnitt-%s',
46+
'BOARDRULES_RULE_ANCHOR' => 'regel-%s',
47+
));

language/nb/boardrules_install.php

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
/**
3+
*
4+
* Board Rules extension for the phpBB Forum Software package.
5+
* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
6+
*
7+
* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
8+
* @license GNU General Public License, version 2 (GPL-2.0)
9+
*
10+
*/
11+
12+
/**
13+
* DO NOT CHANGE
14+
*/
15+
if (!defined('IN_PHPBB'))
16+
{
17+
exit;
18+
}
19+
20+
if (empty($lang) || !is_array($lang))
21+
{
22+
$lang = array();
23+
}
24+
25+
// DEVELOPERS PLEASE NOTE
26+
//
27+
// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
28+
//
29+
// Placeholders can now contain order information, e.g. instead of
30+
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
31+
// translators to re-order the output of data while ensuring it remains correct
32+
//
33+
// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
34+
// equally where a string contains only two placeholders which are used to wrap text
35+
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
36+
//
37+
// Some characters you may want to copy&paste:
38+
// ’ » “ ” …
39+
//
40+
41+
$lang = array_merge($lang, array(
42+
'BOARDRULES_SAMPLE_CATEGORY_TITLE' => 'Regelkategori-eksempel',
43+
'BOARDRULES_SAMPLE_CATEGORY_MESSAGE' => 'Dette er en eksempelkategori for forumreglene. Kategorier kan inneholde grupper av lignende forumregler. Kategorimeldinger (som denne) vises ikke på regelsiden.',
44+
'BOARDRULES_SAMPLE_CATEGORY_ANCHOR' => 'eksempelkategori',
45+
46+
'BOARDRULES_SAMPLE_RULE_TITLE' => 'Regel-eksempel',
47+
'BOARDRULES_SAMPLE_RULE_MESSAGE' => 'Dette er en eksempelregel for forumreglerna. Alt ser ut til å fungere som det skal. Du kan oppdatere eller slette denne regelen og kategorien, og i stedet opprette dine egne forumregler.',
48+
'BOARDRULES_SAMPLE_RULE_ANCHOR' => 'eksempelregel',
49+
));

0 commit comments

Comments
 (0)