Merge remote-tracking branch 'origin/3.1.x'

# Conflicts:
#	composer.json

Author: iMattPro

CHANGELOG.md

@@ -1,44 +1,61 @@
 # Changelog
 
+## 1.0.4 - 2016-12-02
+
+- Fixed some rare cases where errors caused a blank page. They are now caught, resulting in a proper error message.
+- Fixed some missing language keys in rare error messages from the nestedset class.
+- 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.
+- Fixed an issue where the AJAX processing indicator was not displaying in the ACP when moving rules up/down.
+- Ensure compatibility with Symfony in future phpBB releases.
+- Major code improvements and optimisations.
+- Language packs added:
+    - Brazilian-Portuguese
+    - Bulgarian
+    - Norwegian
+    - Slovak
+
 ## 1.0.3 - 2016-01-17
 
-- The same anchor names can now be shared between languages
-- Fixed an issue that prevented rules from being updated on MSSQL systems
-- Added German (Formal Honorifics) language pack
-- Added Mandarin Chinese (Simplified Script) language pack
+- The same anchor names can now be shared between languages.
+- Fixed an issue that prevented rules from being updated on MSSQL systems.
+- Language packs added:
+    - German (Formal Honorifics)
+    - Mandarin Chinese (Simplified Script)
 
 ## 1.0.2 - 2015-05-24
 
-- Fixed an issue where postgreSQL and mssql dbms could not save rules with more than 4,000 characters
-- Added a new template var `S_BOARD_RULES` that styles can use when viewing the rules page
-- Added a table header to the rule lists in the ACP (visual improvement)
-- Coding improvements
-- Added Arabic language pack
-- Added Croatian language pack
-- Added Czech language pack
-- Added German language pack
-- Added Greek language pack
-- Added Hebrew language pack
-- Added Italian language pack
-- Added Polish language pack
-- Added Portuguese language pack
-- Added Romanian language pack
-- Added Russian language pack
-- Added Swedish language pack
-- Added Turkish language pack
-- Require phpBB 3.1.3 or newer
+- Fixed an issue where postgreSQL and MSSQL dbms could not save rules with more than 4,000 characters.
+- Added a new template var `S_BOARD_RULES` that styles can use when viewing the rules page.
+- Added a table header to the rule lists in the ACP (visual improvement).
+- Coding improvements.
+- Language packs added:
+    - Arabic
+    - Croatian
+    - Czech
+    - German
+    - Greek
+    - Hebrew
+    - Italian
+    - Polish
+    - Portuguese
+    - Romanian
+    - Russian
+    - Swedish
+    - Turkish
+- Require phpBB 3.1.3 or newer.
 
 ## 1.0.1 - 2014-11-03
 
-- Fixed an issue where rules could not be deleted with phpBB 3.1.1
-- Fixed an issue where rules could not be created on postgreSQL databases
-- Allow rule parents to be changed when adding/editing rules
-- Hide the rule message editor when editing a rule category
-- Remove the Reset button from rule editing forms
-- Added Spanish language pack
-- Added French language pack
-- Added Dutch language pack
-- Added Estonian language pack
+- Fixed an issue where rules could not be deleted with phpBB 3.1.1.
+- Fixed an issue where rules could not be created on postgreSQL databases.
+- Allow rule parents to be changed when adding/editing rules.
+- Hide the rule message editor when editing a rule category.
+- Remove the Reset button from rule editing forms.
+- Language packs added:
+    - Spanish
+    - French
+    - Dutch
+    - Estonian
 
 ## 1.0.0 - 2014-10-22
 

adm/style/boardrules_manage.html

@@ -153,9 +153,9 @@ <h1>{L_ACP_BOARDRULES_MANAGE}</h1>
 							</td>
 							<td class="actions">
 								<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-								<span class="up"><a href="{rules.U_MOVE_UP}" data-ajax="row_up" data-overlay="false">{ICON_MOVE_UP}</a></span>
+								<span class="up"><a href="{rules.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
 								<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-								<span class="down"><a href="{rules.U_MOVE_DOWN}" data-ajax="row_down" data-overlay="false">{ICON_MOVE_DOWN}</a></span>
+								<span class="down"><a href="{rules.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
 								<a href="{rules.U_EDIT}">{ICON_EDIT}</a>
 								<a href="{rules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 							</td>

language/nb/boardrules_acp.php

@@ -0,0 +1,87 @@
+<?php
+/**
+*
+* Board Rules extension for the phpBB Forum Software package.
+* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
+*
+* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	// Settings page
+	'ACP_BOARDRULES'						=> 'Forumregler',
+	'ACP_BOARDRULES_SETTINGS'				=> 'Innstillinger for forumregler',
+	'ACP_BOARDRULES_SETTINGS_EXPLAIN'		=> 'Her kan du endre innstillingene for forumregler.',
+	'ACP_BOARDRULES_ENABLE'					=> 'Aktiver forumregler',
+	'ACP_BOARDRULES_HEADER_LINK'			=> 'Vis en lenke til forumreglene i toppen av siden',
+	'ACP_BOARDRULES_AT_REGISTRATION'		=> 'Tving nye brukere til å akseptere reglene under registreringen',
+	'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.',
+	'ACP_BOARDRULES_NOTIFY'					=> 'Send melding til brukerne',
+	'ACP_BOARDRULES_NOTIFY_EXPLAIN'			=> 'Sendere en melding til alle registrerte brukere om at forumreglene har blitt oppdatert (dette kan ta noe tid).',
+	'ACP_BOARDRULES_NOTIFY_CONFIRM'			=> 'Er du sikker på at du vil sende en melding til alle brukere?',
+	'ACP_BOARDRULES_SETTINGS_CHANGED'		=> 'Innstillingene for forumreglene har blitt endret.',
+
+	// Manage page
+	'ACP_BOARDRULES_MANAGE'					=> 'Behandle regler',
+	'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.',
+	'ACP_BOARDRULES_CATEGORY'				=> 'Regelkategori',
+	'ACP_BOARDRULES_RULE'					=> 'Regel',
+	'ACP_BOARDRULES_SELECT_LANGUAGE'		=> 'Velg språk',
+	'ACP_BOARDRULES_CREATE_RULE'			=> 'Opprett regel',
+	'ACP_BOARDRULES_CREATE_RULE_EXPLAIN'	=> 'Bruk skjemaet under for å opprettte en ny regel som skal vises til brukerne.',
+	'ACP_BOARDRULES_EDIT_RULE'				=> 'Oppdater regel',
+	'ACP_BOARDRULES_EDIT_RULE_EXPLAIN'		=> 'Bruk skjemaet under for å oppdatere en eksistrende regel som skal vises til brukerne.',
+	'ACP_RULE_SETTINGS'						=> 'Regelinnstillinger',
+	'ACP_RULE_PARENT'						=> 'Overordnet regel',
+	'ACP_RULE_NO_PARENT'					=> 'Ingen overordnet',
+	'ACP_RULE_TITLE'						=> 'Regeltittel',
+	'ACP_RULE_TITLE_EXPLAIN'				=> 'Regeltitler vises kun på kategorienes regelside. Regeltitlene brukes til å identifisere og håndtere reglene i administrasjonskontrollpanelet.',
+	'ACP_RULE_ANCHOR'						=> 'Regelanker',
+	'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.',
+	'ACP_RULE_MESSAGE'						=> 'Regelmelding',
+	'ACP_RULE_MESSAGE_EXPLAIN'				=> 'Regelmeldingen vises på regelsiden for hver regel. (Kategorier viser ikke regelmeldinger.)',
+	'ACP_RULE_MESSAGE_DISABLED'				=> 'Denne kategorien inneholder regler. Meldingsredigering har blitt deaktivert.',
+	'ACP_ADD_RULE'							=> 'Opprett en ny regel',
+	'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.',
+	'ACP_RULE_ADDED'						=> 'Regelen har blitt opprettet.',
+	'ACP_RULE_DELETED'						=> 'Regelen har blitt slettet.',
+	'ACP_RULE_EDITED'						=> 'Regelen har blitt oppdatert.',
+	'ACP_RULE_TITLE_EMPTY'					=> 'Du må angi en tittel for denne regelen.',
+
+	// Nested set exception messages (only appears in PHP error logging)
+	// Translators: Feel free to not translate these language strings
+	'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.',
+	'RULES_NESTEDSET_INVALID_ITEM'			=> 'The requested rule does not exist.',
+	'RULES_NESTEDSET_INVALID_PARENT'		=> 'The requested rule has no parent.',
+));

language/nb/boardrules_common.php

@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* Board Rules extension for the phpBB Forum Software package.
+* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
+*
+* @copyright (c) 2013 phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'BOARDRULES'				=> 'Regler',
+	'BOARDRULES_TITLE'			=> 'Vis forumets regler',
+	'BOARDRULES_AGREEMENT'		=> 'Du aksepterer å følge forumets regler',
+	'BOARDRULES_VIEWONLINE'		=> 'Se forumregler',
+	'BOARDRULES_NOTIFICATION'	=> 'Forumets regler har blitt oppdatert. Klikk her for å lese dem.',
+));

language/nb/boardrules_controller.php

@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* Board Rules extension for the phpBB Forum Software package.
+* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
+*
+* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'BOARDRULES_HEADER'			=> 'Forumregler',
+	'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.',
+	'BOARDRULES_CATEGORIES'		=> 'Regelavsnitt',
+	'BOARDRULES_CATEGORY_ANCHOR'=> 'avsnitt-%s',
+	'BOARDRULES_RULE_ANCHOR'	=> 'regel-%s',
+));

language/nb/boardrules_install.php

@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* Board Rules extension for the phpBB Forum Software package.
+* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
+*
+* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'BOARDRULES_SAMPLE_CATEGORY_TITLE'		=> 'Regelkategori-eksempel',
+	'BOARDRULES_SAMPLE_CATEGORY_MESSAGE'	=> 'Dette er en eksempelkategori for forumreglene. Kategorier kan inneholde grupper av lignende forumregler. Kategorimeldinger (som denne) vises ikke på regelsiden.',
+	'BOARDRULES_SAMPLE_CATEGORY_ANCHOR'		=> 'eksempelkategori',
+
+	'BOARDRULES_SAMPLE_RULE_TITLE'			=> 'Regel-eksempel',
+	'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.',
+	'BOARDRULES_SAMPLE_RULE_ANCHOR'			=> 'eksempelregel',
+));

language/nb/exceptions.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*
+* Board Rules extension for the phpBB Forum Software package.
+* Norwegian translation by Rolv R. Hauge (http://rolvhauge.no)
+*
+* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+/*
+* These are errors which can be triggered by sending invalid data to the
+* boardrules extension API.
+*
+* These errors will never show to a user unless they are either modifying
+* the core boardrules extension code OR unless they are writing an extension
+* which makes calls to this extension.
+*
+* Translators: Feel free to not translate these language strings
+*/
+$lang = array_merge($lang, array(
+	'EXCEPTION_FIELD_MISSING'		=> 'Obligatorisk felt mangler',
+	'EXCEPTION_INVALID_ARGUMENT'	=> 'Ugylding innhold angitt for `%1$s`. Årsak: %2$s',
+	'EXCEPTION_OUT_OF_BOUNDS'		=> 'Feltet `%1$s` har data utover feltets begrensninger',
+	'EXCEPTION_TOO_LONG'			=> 'Inndata var lengre enn den maksimalt tillate lengden.',
+	'EXCEPTION_NOT_UNIQUE'			=> 'Inndata var ikke unike.',
+	'EXCEPTION_UNEXPECTED_VALUE'	=> 'Uventede data mottatt i feltet `%1$s`. Årsak: %2$s',
+	'EXCEPTION_ILLEGAL_CHARACTERS'	=> 'Inndata inneholdt tegn som ikke er tillatt.',
+));