Skip to content

Import only known phrases in the ACP language import #6763

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

Merged
dtdesign merged 2 commits into from
Nov 5, 2026
Merged

Import only known phrases in the ACP language import #6763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a73d5a4
Add `LanguageEditor::importLocalization()` that only updates phrases …
dtdesign Nov 5, 2026
5dfda44
Remove the package selection from the language import form
dtdesign Nov 5, 2026
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
22 changes: 0 additions & 22 deletions wcfsetup/install/files/acp/templates/languageImport.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,6 @@
<small>{lang}wcf.acp.language.add.source.description{/lang}</small>
</dd>
</dl>

<dl{if $errorField == 'packageID'} class="formError"{/if}>
<dt><label for="packageID">{lang}wcf.acp.language.add.package{/lang}</label></dt>
<dd>
<select id="packageID" name="packageID">
<option value="0">{lang}wcf.global.noSelection{/lang}</option>
{foreach from=$packages item=package}
<option value="{$package->packageID}"{if $package->packageID == $packageID} selected{/if}>{$package->getName()} ({$package->package})</option>
{/foreach}
</select>
{if $errorField == 'packageID'}
<small class="innerError">
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.acp.language.add.package.error.{$errorType}{/lang}
{/if}
</small>
{/if}
<small>{lang}wcf.acp.language.add.package.description{/lang}</small>
</dd>
</dl>

{event name='fields'}
</div>
Expand Down
27 changes: 1 addition & 26 deletions wcfsetup/install/files/lib/acp/form/LanguageImportForm.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

use wcf\data\language\Language;
use wcf\data\language\LanguageEditor;
use wcf\data\package\Package;
use wcf\data\package\PackageCache;
use wcf\event\language\LanguageImported;
use wcf\form\AbstractForm;
use wcf\system\cache\CacheHandler;
Expand Down Expand Up @@ -65,12 +63,6 @@ class LanguageImportForm extends AbstractForm
*/
public $sourceLanguageID = 0;

/**
* @var int
* @since 5.4
*/
public $packageID = 0;

#[\Override]
public function readParameters()
{
Expand All @@ -90,9 +82,6 @@ public function readFormParameters()
if (isset($_POST['sourceLanguageID'])) {
$this->sourceLanguageID = \intval($_POST['sourceLanguageID']);
}
if (isset($_POST['packageID'])) {
$this->packageID = \intval($_POST['packageID']);
}
}

#[\Override]
Expand All @@ -115,18 +104,14 @@ public function validate()
throw new UserInputException('sourceLanguageID');
}

if (PackageCache::getInstance()->getPackage($this->packageID) === null) {
throw new UserInputException('packageID');
}

// try to import
try {
// open xml document
$xml = new XML();
$xml->load($this->filename);

// import xml document
$this->language = LanguageEditor::importFromXML($xml, $this->packageID, $this->sourceLanguage);
$this->language = LanguageEditor::importLocalization($xml, $this->sourceLanguage);

// copy content
if (!isset($this->languages[$this->language->languageID])) {
Expand Down Expand Up @@ -156,7 +141,6 @@ public function save()

// reset fields
$this->sourceLanguageID = 0;
$this->packageID = 0;

// show success message
WCF::getTPL()->assign('success', true);
Expand All @@ -167,18 +151,9 @@ public function assignVariables()
{
parent::assignVariables();

$packages = PackageCache::getInstance()->getPackages();
$collator = new \Collator(WCF::getLanguage()->getLocale());
\usort(
$packages,
static fn(Package $a, Package $b) => $collator->compare($a->getName(), $b->getName())
);

WCF::getTPL()->assign([
'languages' => $this->languages,
'sourceLanguageID' => $this->sourceLanguageID,
'packages' => $packages,
'packageID' => $this->packageID,
]);
}
}
Loading
Loading