Merge pull request #147 from phpbb/update/trackerKey

Change tracker project key to start with PHPBB-
phpbb · Jun 1, 2024 · 63780af · 63780af
2 parents 20a96b1 + 6021129
commit 63780af
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -93,23 +93,23 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.1"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.2"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.3"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.4"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.5"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mysql:5.6"
                       db_alias: "MyISAM Tests"
                       MYISAM: 1
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mysql:5.6"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mysql:5.7"
                     - php: '7.2'
                       db: "mysql:5.7"
@@ -244,18 +244,16 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:9.5"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:9.6"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:10"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:11"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:12"
-                    - php: '7.1'
-                      db: "postgres:13"
                     - php: '7.2'
                       db: "postgres:13"
                     - php: '7.3'

diff --git a/language/en/common.php b/language/en/common.php
@@ -84,9 +84,9 @@
 	'STATUS'				=> 'Status',
 
 	'TICKET'				=> 'Ticket',
-	'TICKET_ERROR'			=> 'Ticket ID must be of the format “PHPBB3-#####”.',
+	'TICKET_ERROR'			=> 'Ticket ID must be of the format “PHPBB-#####” or “PHPBB3-#####”.',
 	'TICKET_ERROR_DUP'		=> 'You must click on an idea title from the live search results. To delete the duplicate, clear the field and press ENTER. To exit this field press ESC.',
-	'TOP'                   => 'Top',
+	'TOP'					=> 'Top',
 	'TOP_IDEAS'				=> 'Top Ideas',
 	'TOTAL_IDEAS'			=> [
 		1	=> '%d idea',

diff --git a/styles/prosilver/template/idea_body.html b/styles/prosilver/template/idea_body.html
@@ -53,10 +53,10 @@ <h3>{{ lang('STATUS') }}</h3>
 				{% if IDEA_TICKET or S_CAN_EDIT %}
 					<div class="status-item flex-box flex-align-end">
 						{{ lang('TICKET') ~ lang('COLON') }}
-						<label for="ticketeditinput"><a id="ticketlink" {% if IDEA_TICKET %}href="https://tracker.phpbb.com/browse/PHPBB3-{{ IDEA_TICKET }}">PHPBB3-{{ IDEA_TICKET }}{% else %}style="display:none">{% endif %}</a></label>
+						<label for="ticketeditinput"><a id="ticketlink" {% if IDEA_TICKET %}href="https://tracker.phpbb.com/browse/PHPBB-{{ IDEA_TICKET }}">PHPBB-{{ IDEA_TICKET }}{% else %}style="display:none">{% endif %}</a></label>
 						{% if S_CAN_EDIT %}
 							<a href="{{ U_EDIT_TICKET }}" id="ticketedit" data-l-add="{{ lang('ADD') }}" data-l-edit="{{ lang('EDIT') }}">{% if IDEA_TICKET %}<i class="icon fa-fw fa-pencil"></i>{{ lang('EDIT') }}{% else %}<i class="icon fa-fw fa-plus-circle"></i>{{ lang('ADD') }}{% endif %}</a>
-							<input type="text" id="ticketeditinput" class="ideainput"{% if IDEA_TICKET %} value="PHPBB3-{{ IDEA_TICKET }}"{% endif %} placeholder="PHPBB3-#####" data-l-err="{{ lang('ERROR') }}" data-l-msg="{{ lang('TICKET_ERROR') }}">
+							<input type="text" id="ticketeditinput" class="ideainput"{% if IDEA_TICKET %} value="PHPBB-{{ IDEA_TICKET }}"{% endif %} placeholder="PHPBB-#####" data-l-err="{{ lang('ERROR') }}" data-l-msg="{{ lang('TICKET_ERROR') }}">
 						{% endif %}
 					</div>
 				{% endif %}

diff --git a/styles/prosilver/template/ideas.js b/styles/prosilver/template/ideas.js
@@ -224,13 +224,13 @@
 				value = $this.val(),
 				info;
 
-			if (value && !(info = /^PHPBB3-(\d{1,6})$/.exec(value))) {
+			if (value && !(info = /^PHPBB3?-(\d{1,6})$/.exec(value))) {
 				phpbb.alert($this.attr('data-l-err'), $this.attr('data-l-msg'));
 				return;
 			}
 
 			if (value) {
-				value = 'PHPBB3-' + info[1];
+				value = 'PHPBB-' + info[1];
 			}
 
 			showLoadingIndicator();