Issue tracker: #two-column-edit-conflict-merge

Extension:Paragraph-based Edit Conflict Interface/ja

From Linux Web Expert

MediaWiki 拡張機能マニュアル
File:OOjs UI icon advanced-invert.svg
TwoColConflict
リリースの状態: 安定
File:New design for the Two Column edit conflict interface, status October 2018.png
実装 ユーザー インターフェイス
説明 競合解決の編集ページに2列の代替ビューを提供する
作者 ウィキメディア・ドイツ（WMDE）
最新バージョン 継続的な更新
互換性の方針 MediaWiki とともにリリースされるスナップショット。 master には後方互換性がありません。
MediaWiki >= 1.42.0
ライセンス GNU 一般公衆利用許諾書 2.0 以降
ダウンロード
<translate> Download extension</translate>
<translate> Git</translate> [?]:
パラメーター
  • $wgTwoColConflictBetaFeature
  • $wgTwoColConflictTrackingOversample
  • $wgTwoColConflictSuggestResolution
使用するフック
Quarterly downloads Lua error in Module:Extension at line 172: bad argument #1 to 'inNamespace' (unrecognized namespace name 'skin').
Public wikis using Lua error in Module:Extension at line 172: bad argument #1 to 'inNamespace' (unrecognized namespace name 'skin').
Paragraph-based Edit Conflict Interface 拡張機能の翻訳にご協力ください
問題点 未解決のタスク · バグを報告

段落ベースの編集競合インターフェース(旧名:編集競合の2列インターフェース)は、編集競合を解消するページの新しいインターフェイスです。競合している箇所を並べて表示し、元の版と自分の編集を簡単に反映させることができます。 It displays colliding text passages in pairs next to each other, making it easier to merge your text with the one that’s currently online.

使用法

新しい表示の有効化: 編集の競合解消のための新しい表示を有効にするには、ログインしてあなたのウィキのベータ機能設定タブを開き、「段落ベースの競合編集インターフェース」機能のチェックボックスにチェックを入れる必要があります。すでに最初の全てのベータ機能を有効にしている場合は、自動的に新しい表示が適用されます。 If you had already activated the first beta feature, you will automatically get the new view.

File:New design for the Two Column edit conflict interface, status October 2018.png

1. Get oriented. In order to help you solve the edit conflict, the interface breaks down the differences between the two revisions like this:

  • Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
  • Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.

A tutorial guides you through the interface the first time you encounter an edit conflict. You can open it again by clicking on the help icon (?).

  • If you want to copy your version (the entire article text with your edits) of the article page, click on the 'copy full text' link next to the blue marked 'Your revision' headline on the top of the interface.


File:Two col conflict selected text passage.png
選択した文と、編集モードを開始する黒い鉛筆型のアイコン
File:Two col conflict selected text passage in editing mode.png
編集モードのテキスト入力欄と、チェックマーク、「×」

2. Build a new version by merging your text with the one that’s currently online.

  • Select the passages you want to keep by clicking on the radio buttons next to them. By default, all texts from the other person are selected, so if you publish immediately, none of your text changes are saved.
  • Edit passages, if needed.
  • Click on the black pencil to open the editing mode for a text passage. If the pencil is grey, it means you need to select the text passage first. Otherwise, this version won’t be saved when you click publish.
  • You can also edit text passages that are identical in both versions.
  • The highlights that indicate the differences between the versions disappear when you edit a text passage.
  • You can integrate parts from other text passages by copy and paste, either with the copy and paste function on your keyboard or with a right click.
  • Click on the check mark to apply changes to a text box and to close its editing mode.
  • If you want to discard your changes and reset the contents of the text box to what it was when the edit conflict occurred, click on the "X". This also restores the highlighting.

3. Publish a new page version. When you’re done selecting and editing all of the passages, click “Publish changes”. This composes all of the text passages you selected and the grey boxes into a new page revision. As on all wiki pages, you can preview the changes first via the Preview button. On clicking Cancel, you return to the current version of the page.

Non-JavaScript version

If you are not using JavaScript, the look or behavior of the feature will be as follows:

  • All text passages are shown in editor boxes.
  • There are no buttons within the editor boxes.
  • Text passages that are identical in both versions are always expanded.

インストール

  • <translate> [[<tvar name=2>Special:ExtensionDistributor/TwoColConflict</tvar>|Download]] and move the extracted <tvar name=name>TwoColConflict</tvar> folder to your <tvar name=ext>extensions/</tvar> directory.</translate>
    <translate> Developers and code contributors should install the extension [[<tvar name=git>Special:MyLanguage/Download from Git</tvar>|from Git]] instead, using:</translate>cd extensions/
    git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/TwoColConflict
  • <translate> Add the following code at the bottom of your <tvar name=1>LocalSettings.php </tvar> file:</translate> 
    wfLoadExtension( 'TwoColConflict' );
  • 必要に応じて設定します。
  • File:OOjs UI icon check-constructive.svg <translate> Done</translate> – <translate> Navigate to <tvar name=special>Special:Version</tvar> on your wiki to verify that the extension is successfully installed.</translate>

設定

  • $wgTwoColConflictBetaFeature - (boolean, 既定ではtrue) Extension:BetaFeatures が有効なとき、この拡張機能をベータ版機能として有効にします。
  • $wgTwoColConflictSuggestResolution - (boolean, true by default) Suggest an easy resolution for edit conflicts on talk pages when two users replied at the same time.

リンク

Retrieved from "https://www.linuxwebexpert.com/wiki/index.php?title=Extension:Paragraph-based_Edit_Conflict_Interface/ja&oldid=23686"