Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #3089 【baserCMS5】Twitter→Xに伴うアイコン、文言変更 #3185

Merged
merged 2 commits into from
Mar 4, 2024
Merged

fix #3089 【baserCMS5】Twitter→Xに伴うアイコン、文言変更 #3185

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fd4ae0
fix #3089 【baserCMS5】Twitter→Xに伴うアイコン、文言変更
kaburk Feb 29, 2024
e5ef6dd
fix #3089 【baserCMS5】Twitter→Xに伴うアイコン、文言変更
kaburk Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9,742 changes: 4,926 additions & 4,816 deletions plugins/baser-core/resources/locales/baser_core.pot
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified plugins/baser-core/resources/locales/en/baser_core.mo
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions plugins/baser-core/resources/locales/en/baser_core.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ msgid ""
msgstr ""
"Project-Id-Version: baserCMS\n"
"POT-Creation-Date: 2023-04-24 13:30+0900\n"
"PO-Revision-Date: 2023-04-24 13:41+0900\n"
"PO-Revision-Date: 2024-02-29 12:03+0900\n"
"Last-Translator: ryuring\n"
"Language-Team: baserCMS Users Community <[email protected]>\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 3.2.2\n"
"X-Generator: Poedit 3.4.2\n"

#: plugins/baser-core/config/permission.php:22
msgid "コンテンツフォルダ管理"
Expand Down Expand Up @@ -7415,8 +7415,8 @@ msgid "いいね！をクリックして普及にご協力ください。"
msgstr "Please support spreading by clicking Like!"

#: plugins/bc-admin-third/templates/email/text/installed.php:87
msgid "baserCMS公式Twitter"
msgstr "baserCMS Official Twitter"
msgid "baserCMS公式X"
msgstr "baserCMS Official X"

#: plugins/bc-admin-third/templates/email/text/installed.php:89
msgid "TIPSや最新情報をつぶやいてます。Follow Me！"
Expand Down Expand Up @@ -9396,8 +9396,8 @@ msgid "フォーラムにインストールの不具合を報告する"
msgstr "Report bug in installation to forum"

#: plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/step5.php:44
msgid "公式Twitterをフォローする"
msgstr "Follow official Twitter"
msgid "公式TXをフォローする"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaburk TXになっちゃってますね

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh....

msgstr "Follow official X"

#: plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/step5.php:46
msgid "Facebookでいいね！する"
Expand Down Expand Up @@ -14929,8 +14929,8 @@ msgstr ""
#~ msgid "baserCMS Facebook"
#~ msgstr "baserCMS Facebook"

#~ msgid "baserCMS Twitter"
#~ msgstr "baserCMS Twitter"
#~ msgid "baserCMS X"
#~ msgstr "baserCMS X"

#~ msgid "baserCMS管理システム"
#~ msgstr "baserCMS Management System"
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-admin-third/src/css/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
}
&--twitter {
@include bca-icon(twitter);
background-color: #54ABED;
background-color: #000;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-admin-third/src/css/vendor/Font-Awesome/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ $fa-var-tumblr: \f173;
$fa-var-tumblr-square: \f174;
$fa-var-tv: \f26c;
$fa-var-twitch: \f1e8;
$fa-var-twitter: \f099;
$fa-var-twitter: \1d54f;
$fa-var-twitter-square: \f081;
$fa-var-typo3: \f42b;
$fa-var-uber: \f402;
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-admin-third/templates/Admin/Utilities/credit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<?php echo h($contributor->alphabet) ?>
<?php endif ?>
<?php if (!empty($contributor->twitter)): ?>
(<?php $this->BcBaser->link($contributor->twitter, 'http://twitter.com/' . $contributor->twitter, ['target' => '_blank', 'escape' => true]) ?>)
(<?php $this->BcBaser->link($contributor->twitter, 'https://twitter.com/' . $contributor->twitter, ['target' => '_blank', 'escape' => true]) ?>)
<?php endif ?>
</li>
<?php if ($i % 6 == 0 || $this->BcArray->last($credits->{$type}, $key)): ?>
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-admin-third/templates/email/text/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
https://www.facebook.com/basercms
<?php echo __d('baser_core', 'いいね！をクリックして普及にご協力ください。') ?>　

■ <?php echo __d('baser_core', 'baserCMS公式Twitter') ?>　
■ <?php echo __d('baser_core', 'baserCMS公式X') ?>　
https://twitter.com/basercms
<?php echo __d('baser_core', 'TIPSや最新情報をつぶやいてます。Follow Me！') ?>　

Expand Down
4 changes: 2 additions & 2 deletions plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/step5.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<?php echo __d('baser_core', 'baserCMS公式ガイドで学ぶ') ?></a></li>
<li><a href="https://forum.basercms.net" title="baserCMSユーザーズフォーラム" target="_blank" class="outside-link">
<?php echo __d('baser_core', 'フォーラムにインストールの不具合を報告する') ?></a></li>
<li><a href="https://twitter.com/#!/basercms" title="baserCMS公式Twitter" target="_blank" class="outside-link">
<?php echo __d('baser_core', '公式Twitterをフォローする') ?></a></li>
<li><a href="https://twitter.com/basercms" title="baserCMS公式X" target="_blank" class="outside-link">
<?php echo __d('baser_core', '公式Xをフォローする') ?></a></li>
<li><a href="https://facebook.com/basercms" title="baserCMS公式Facebookページ" target="_blank" class="outside-link">
<?php echo __d('baser_core', 'Facebookでいいね！する') ?></a></li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions plugins/bc-admin-third/webroot/css/admin/style.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading