Merge pull request #50 from Crizz0/issue/49

Add lang keys for syntax languages

Author: Crizz0

config/services.yml

@@ -10,6 +10,7 @@ services:
         arguments:
             - '%phpbbde.pastebin.geshilangs%'
             - '%core.php_ext%'
+            - '@language'
     phpbbde.pastebin.functions.pastebin:
         class: phpbbde\pastebin\functions\pastebin
         arguments:

functions/utility.php

@@ -27,17 +27,23 @@ class utility
 	/** @var string */
 	protected $php_ext;
 
+	/* @var \phpbb\language\language */
+	protected $language;
+
 	/**
 	 * Constructor
 	 * @param string $php_ext
+	 * @param \phpbb\language\language	$language
 	 */
 	function __construct(
 		$geshi_dir,
-		$php_ext)
+		$php_ext,
+		\phpbb\language\language $language)
 	{
 		$this->geshi_dir	= $geshi_dir;
 		$this->geshi_list	= $this->geshi_list();
 		$this->php_ext 		= $php_ext;
+		$this->language		= $language;
 	}
 
 
@@ -81,91 +87,21 @@ function geshi_list()
 	 */
 	function highlight_select($default = 'text')
 	{
-		// Programming languages
-		// these are used by geshi
+		/** Programming languages used by geshi
+		 * Check \phpbbde\pastebin\vendor\easybook\geshi\geshi for more languages
+		 * Add them to the array $programming_langs
+		 * Don't forget to add fitting language variables to \phpbbde\pastebin\language\<iso>\pastebin.php as well
+		 */
 		$programming_langs = array(
-			'text'				=> 'Text',
-			'php'				=> 'PHP',
-			'sql'				=> 'SQL',
-			'html4strict'		=> 'HTML',
-			'css'				=> 'CSS',
-			'javascript'		=> 'Javascript',
-			'xml'				=> 'XML',
-			'diff'				=> 'Diff',
-			'robots'			=> 'robots.txt',
-
-			/**
-			 * Wenn eine weitere Sprache aktiviert werden soll, muss die Datei in den includes/geshi/ Ordner
-			 * kopiert werden, und der Eintrag der Sprachdatei wieder nach aktiviert werden.
-			 */
-
-			/*
-				'actionscript'		=> 'ActionScript',
-				'ada'				=> 'Ada',
-				'apache'			=> 'Apache',
-				'applescript'		=> 'AppleScript',
-				'asm'				=> 'x86 Assembler',
-				'autoit'			=> 'AutoIt',
-				'bash'				=> 'Bash',
-				'blitzbasic'		=> 'BlitzBasic',
-				'bnf'				=> 'BNF',
-				'c_mac'				=> 'C (Mac)',
-				'caddcl'			=> 'CAD DCL',
-				'cadlisp'			=> 'CAD Lisp',
-				'cfdg'				=> 'CFDG',
-				'cfm'				=> 'ColdFusion',
-				'cpp-qt'			=> 'C++ (QT)',
-				'css-gen.cfg'		=> 'C#',
-				'c_mac'				=> 'C (Mac)',
-				'd'					=> 'D',
-				'delphi'			=> 'Delphi',
-				'div'				=> 'DIV',
-				'dos'				=> 'DOS',
-				'eiffel'			=> 'Eiffel',
-				'fortran'			=> 'Fortran',
-				'freebasic'			=> 'FreeBasic',
-				'gml'				=> 'GML',
-				'groovy'			=> 'Groovy',
-				'idl'				=> 'Uno Idl',
-				'ini'				=> 'INI',
-				'inno'				=> 'Inno',
-				'io'				=> 'Io',
-				'java5'				=> 'Java(TM) 2 Platform Standard Edition 5.0',
-				'latex'				=> 'LaTeX',
-				'lisp'				=> 'Lisp',
-				'lua'				=> 'Lua',
-				'matlab'			=> 'Matlab M',
-				'mirc'				=> 'mIRC Scripting',
-				'mpasm'				=> 'Microchip Assembler',
-				'mysql'				=> 'MySQL',
-				'nsis'				=> 'NSIS',
-				'objc'				=> 'Objective C',
-				'ocaml-brief'		=> 'OCaml',
-				'ocaml'				=> 'OCaml',
-				'oobas'				=> 'OpenOffice.org Basic',
-				'oracle8'			=> 'Oracle 8 SQL',
-				'pascal'			=> 'Pascal',
-				'php-brief'			=> 'PHP (brief)',
-				'ruby'				=> 'Ruby',
-				'sas'				=> 'SAS',
-				'scheme'			=> 'Scheme',
-				'sdlbasic'			=> 'sdlBasic',
-				'smalltalk'			=> 'Smalltalk',
-				'tcl'				=> 'TCL',
-				'thinbasic'			=> 'thinBasic',
-				'tsql'				=> 'T-SQL',
-				'plsql'				=> 'PL/SQL',
-				'python'			=> 'Python',
-				'qbasic'			=> 'QBasic/QuickBASIC',
-				'rails'				=> 'Rails',
-				'reg'				=> 'Microsoft Registry',
-				'vbnet'				=> 'vb.net',
-				'vhdl'				=> 'VHDL',
-				'visualfoxpro'		=> 'Visual Fox Pro',
-				'winbatch'			=> 'Winbatch',
-				'xpp'				=> 'X++',
-				'z80'				=> 'ZiLOG Z80 Assembler',
-			*/
+			'text',
+			'php',
+			'sql',
+			'html5',
+			'css',
+			'javascript',
+			'xml',
+			'diff',
+			'robots',
 		);
 
 		if (!in_array($default, $this->geshi_list))
@@ -174,11 +110,12 @@ function highlight_select($default = 'text')
 		}
 
 		$output = '';
-		foreach ($programming_langs as $code => $name)
+		$lang_prefix = 'PASTEBIN_LANGS_';
+		foreach ($programming_langs as $code)
 		{
 			if (in_array($code, $this->geshi_list))
 			{
-				$output .= '<option' . (($default == $code) ? ' selected="selected"' : '') . ' value="' . htmlentities($code, ENT_QUOTES) . '">' . $name . '</option>';
+				$output .= '<option' . (($default == $code) ? ' selected="selected"' : '') . ' value="' . htmlentities($code, ENT_QUOTES) . '">' . $this->language->lang($lang_prefix . strtoupper($code)) . '</option>';
 			}
 		}
 

language/de/pastebin.php

@@ -101,4 +101,15 @@
 	'PASTEBIN_SNIPPET_PRUNABLE'			=> 'Eintrag prunable - automatisch löschbar',
 	'PASTEBIN_SNIPPET_PRUNABLE_EXPLAIN'	=> 'Wenn diese Option deaktiviert ist, wird der Eintrag nicht in die monatlich automatisch zu löschenden Einträge aufgenommen.',
 	'PASTEBIN_SNIPPET_SUBMITTED'			=> 'Dein Eintrag wurde erfolgreich erstellt.',
+
+	// Language keys for Syntax highlighting dropdown
+	'PASTEBIN_LANGS_TEXT' 		=> 'Text',
+	'PASTEBIN_LANGS_PHP'		=> 'PHP',
+	'PASTEBIN_LANGS_SQL' 		=> 'SQL',
+	'PASTEBIN_LANGS_HTML5' 		=> 'HTML',
+	'PASTEBIN_LANGS_CSS' 		=> 'CSS',
+	'PASTEBIN_LANGS_JAVASCRIPT'	=> 'JavaScript',
+	'PASTEBIN_LANGS_XML' 		=> 'XML',
+	'PASTEBIN_LANGS_DIFF' 		=> 'diff',
+	'PASTEBIN_LANGS_ROBOTS' 	=> 'Robots.txt',
 ));

language/en/pastebin.php

@@ -100,4 +100,15 @@
 	'PASTEBIN_SNIPPET_PRUNABLE'			=> 'Entry prunable',
 	'PASTEBIN_SNIPPET_PRUNABLE_EXPLAIN'	=> 'If this option is disabled, the entry will not be entered in the monthly list of prunable entries.',
 	'PASTEBIN_SNIPPET_SUBMITTED'			=> 'Your entry was sucessfully created.',
+
+	// Language keys for Syntax highlighting dropdown
+	'PASTEBIN_LANGS_TEXT'		=> 'Text',
+	'PASTEBIN_LANGS_PHP' 		=> 'PHP',
+	'PASTEBIN_LANGS_SQL' 		=> 'SQL',
+	'PASTEBIN_LANGS_HTML5' 		=> 'HTML',
+	'PASTEBIN_LANGS_CSS' 		=> 'CSS',
+	'PASTEBIN_LANGS_JAVASCRIPT'	=> 'JavaScript',
+	'PASTEBIN_LANGS_XML' 		=> 'XML',
+	'PASTEBIN_LANGS_DIFF' 		=> 'diff',
+	'PASTEBIN_LANGS_ROBOTS'		=> 'Robots.txt',
 ));