provide bbcode translation for imported red zmg tag (img tag with zot-id)

pull/685/head
friendica 10 years ago
parent ec14d06647
commit b60e42d2fa
  1. 2
      boot.php
  2. 2
      include/bbcode.php
  3. 6
      util/messages.po

@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1708' );
define ( 'FRIENDICA_VERSION', '3.1.1714' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1163 );
define ( 'EOL', "<br />\r\n" );

@ -543,10 +543,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
// [img=widthxheight]image source[/img]
//$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="width: $1px;" >', $Text);
$Text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$3" style="width: $1px;" >', $Text);
// Images
// [img]pathtoimage[/img]
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
$Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
// Shared content
if (!$simplehtml)

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.1.1708\n"
"Project-Id-Version: 3.1.1714\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-22 00:01-0700\n"
"POT-Creation-Date: 2013-05-28 00:01-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -6351,7 +6351,7 @@ msgid "Tips for New Members"
msgstr ""
#: ../../mod/install.php:117
msgid "Friendica Social Communications Server - Setup"
msgid "Friendica Communications Server - Setup"
msgstr ""
#: ../../mod/install.php:123

Loading…
Cancel
Save