Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions app/classes/Transvision/Project.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ class Project
'source_type' => 'mixed',
'variable_patterns' => ['ftl'],
],
'firefox_com' => [
'git_repository' => 'mozilla-l10n/www-firefox-l10n',
'git_branch' => 'main',
'pontoon_project' => 'firefoxcom',
'reference_locale' => 'en',
'source_type' => 'mixed',
'variable_patterns' => ['ftl'],
],
'android_l10n' => [
'git_repository' => 'mozilla-l10n/android-l10n',
'git_branch' => 'master',
Expand Down Expand Up @@ -114,8 +122,8 @@ class Project
],
// Products using Git
'git' => [
'android_l10n', 'firefox_ios', 'gecko_strings', 'mozilla_org',
'seamonkey', 'thunderbird', 'vpn_client',
'android_l10n', 'firefox_ios', 'gecko_strings', 'firefox_com',
'mozilla_org', 'seamonkey', 'thunderbird', 'vpn_client',
],
// Products using free text search on Pontoon
'text_search' => [
Expand Down
4 changes: 2 additions & 2 deletions app/classes/Transvision/VersionControl.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ public static function gitPath($locale, $repo, $path)

return "https://github.com/{$git_repo}/blob/{$git_branch}/{$file_path}";
}
if ($repo == 'mozilla_org') {
// Special case for mozilla.org (Fluent)
if ($repo == 'mozilla_org' || $repo == 'firefox_com') {
// Special case for mozilla.org and firefox.com (Fluent)
if ($locale != 'en') {
$file_path = str_replace('en/', "{$locale}/", $file_path);
}
Expand Down
3 changes: 2 additions & 1 deletion app/models/unchanged_strings.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?php
namespace Transvision;

// Set up the repository selector, remove meta project and mozilla.org
// Set up the repository selector, remove meta project, mozilla.org, firefox.com
$repositories = Project::getSupportedRepositories(true);
unset($repositories['mozilla_org']);
unset($repositories['firefox_com']);
$repository_selector = Utils::getHtmlSelectOptions($repositories, $repo, true);

$reference_locale = Project::getReferenceLocale($repo);
Expand Down
4 changes: 4 additions & 0 deletions app/scripts/bash_variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ folders+=( $seamonkey_path )
mozilla_org=$local_git/mozilla_org/
folders+=( $mozilla_org )

# Location of firefox.com repository (Fluent based)
firefox_com=$local_git/firefox_com/
folders+=( $firefox_com )

# Firefox for iOS, Android-l10n, VPN Client
android_l10n=$local_git/android_l10n/
firefox_ios=$local_git/firefox_ios/
Expand Down
14 changes: 14 additions & 0 deletions app/scripts/glossaire.sh
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,27 @@ function updateMozOrg() {
nice -20 $install/app/scripts/tmx/tmx_projectconfig.py $mozilla_org/l10n-vendor.toml --ref en --repo mozilla_org
}

function updateFirefoxCom() {
if [ "$checkrepo" = true ]
then
cd $firefox_com
echogreen "Update GitHub repository"
git pull
fi
echogreen "Extract strings for firefox.com (Fluent)"
cd $install
nice -20 $install/app/scripts/tmx/tmx_projectconfig.py $firefox_com/l10n-pontoon.toml --ref en --repo firefox_com
nice -20 $install/app/scripts/tmx/tmx_projectconfig.py $firefox_com/l10n-vendor.toml --ref en --repo firefox_com
}

echogreen "Activating virtualenv..."
source $install/python-venv/bin/activate || exit 1

updateMultirepo gecko_strings
updateMultirepo thunderbird
updateSeamonkey
updateMozOrg
updateFirefoxCom
updateOtherProduct firefox_ios "Firefox for iOS" tmx_xliff
updateOtherProduct vpn_client "Mozilla VPN Client" tmx_xliff
updateAndroidl10n
Expand Down
7 changes: 7 additions & 0 deletions app/scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,13 @@ then
git clone https://github.com/mozilla-l10n/www-l10n .
fi

cd $firefox_com
if [ ! -d $firefox_com/.git ]
then
echogreen "Checking out firefox.com (Fluent) repo"
git clone https://github.com/mozilla-l10n/www-firefox-l10n .
fi

cd $firefox_ios
if [ ! -d $firefox_ios/.git ]
then
Expand Down