feat: Add MaxTokens option and i18n support for language variants

- Add MaxTokens option for AI model output control
- Add i18n support for language variants (pt-BR/pt-PT)

Author: 2b3pro

.vscode/settings.json

@@ -18,6 +18,7 @@
 		"Callirhoe",
 		"Callirrhoe",
 		"Cerebras",
+		"colour",
 		"compadd",
 		"compdef",
 		"compinit",
@@ -129,6 +130,7 @@
 		"opencode",
 		"opencontainers",
 		"openrouter",
+		"organise",
 		"Orus",
 		"osascript",
 		"otiai",

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.4.317 (2025-09-21)
+
+### PR [#1778](https://github.com/danielmiessler/Fabric/pull/1778) by [ksylvan](https://github.com/ksylvan): Add Portuguese Language Variants Support (pt-BR and pt-PT)
+
+- Add Brazilian Portuguese (pt-BR) translation file
+- Add European Portuguese (pt-PT) translation file
+- Implement BCP 47 locale normalization system
+- Create fallback chain for language variants
+- Add default variant mapping for Portuguese
+
 ## v1.4.316 (2025-09-20)
 
 ### PR [#1777](https://github.com/danielmiessler/Fabric/pull/1777) by [ksylvan](https://github.com/ksylvan): chore: remove garble installation from release workflow

cmd/fabric/version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v1.4.316"
+var version = "v1.4.317"

cmd/generate_changelog/changelog.db

@@ -0,0 +1,140 @@
+# Language Variants Support in Fabric
+
+## Current Implementation
+
+As of this update, Fabric supports Portuguese language variants:
+
+- `pt-BR` - Brazilian Portuguese
+- `pt-PT` - European Portuguese
+- `pt` - defaults to `pt-BR` for backward compatibility
+
+## Architecture
+
+The i18n system supports language variants through:
+
+1. **BCP 47 Format**: All locales are normalized to BCP 47 format (language-REGION)
+2. **Fallback Chain**: Regional variants fall back to base language, then to configured defaults
+3. **Default Variant Mapping**: Languages without base files can specify default regional variants
+4. **Flexible Input**: Accepts both underscore (pt_BR) and hyphen (pt-BR) formats
+
+## Recommended Future Variants
+
+Based on user demographics and linguistic differences, these variants would provide the most value:
+
+### High Priority
+
+1. **Chinese Variants**
+   - `zh-CN` - Simplified Chinese (Mainland China)
+   - `zh-TW` - Traditional Chinese (Taiwan)
+   - `zh-HK` - Traditional Chinese (Hong Kong)
+   - Default: `zh` → `zh-CN`
+   - Rationale: Significant script and vocabulary differences
+
+2. **Spanish Variants**
+   - `es-ES` - European Spanish (Spain)
+   - `es-MX` - Mexican Spanish
+   - `es-AR` - Argentinian Spanish
+   - Default: `es` → `es-ES`
+   - Rationale: Notable vocabulary and conjugation differences
+
+3. **English Variants**
+   - `en-US` - American English
+   - `en-GB` - British English
+   - `en-AU` - Australian English
+   - Default: `en` → `en-US`
+   - Rationale: Spelling differences (color/colour, organize/organise)
+
+4. **French Variants**
+   - `fr-FR` - France French
+   - `fr-CA` - Canadian French
+   - Default: `fr` → `fr-FR`
+   - Rationale: Some vocabulary and expression differences
+
+5. **Arabic Variants**
+   - `ar-SA` - Saudi Arabic (Modern Standard)
+   - `ar-EG` - Egyptian Arabic
+   - Default: `ar` → `ar-SA`
+   - Rationale: Significant dialectal differences
+
+6. **German Variants**
+   - `de-DE` - Germany German
+   - `de-AT` - Austrian German
+   - `de-CH` - Swiss German
+   - Default: `de` → `de-DE`
+   - Rationale: Minor differences, mostly vocabulary
+
+## Implementation Guidelines
+
+When adding new language variants:
+
+1. **Determine the Base**: Decide which variant should be the default
+2. **Create Variant Files**: Copy base file and adjust for regional differences
+3. **Update Default Map**: Add to `defaultLanguageVariants` if needed
+4. **Focus on Key Differences**:
+   - Technical terminology
+   - Common UI terms (file/ficheiro, save/guardar)
+   - Date/time formats
+   - Currency references
+   - Formal/informal address conventions
+
+5. **Test Thoroughly**: Ensure fallback chain works correctly
+
+## Adding a New Variant
+
+To add a new language variant:
+
+1. Copy the base language file:
+
+   ```bash
+   cp locales/es.json locales/es-MX.json
+   ```
+
+2. Adjust translations for regional differences
+
+3. If this is the first variant for a language, update `i18n.go`:
+
+   ```go
+   var defaultLanguageVariants = map[string]string{
+       "pt": "pt-BR",
+       "es": "es-MX",  // Add if Mexican Spanish should be default
+   }
+   ```
+
+4. Add tests for the new variant
+
+5. Update documentation
+
+## Language Variant Naming Convention
+
+Follow BCP 47 standards:
+
+- Language code: lowercase (pt, es, en)
+- Region code: uppercase (BR, PT, US)
+- Separator: hyphen (pt-BR, not pt_BR)
+
+Input normalization handles various formats, but files and internal references should use BCP 47.
+
+## Testing Variants
+
+Test each variant with:
+
+```bash
+# Direct specification
+fabric --help -g=pt-BR
+fabric --help -g=pt-PT
+
+# Environment variable
+LANG=pt_BR.UTF-8 fabric --help
+
+# Fallback behavior
+fabric --help -g=pt  # Should use pt-BR
+```
+
+## Maintenance Considerations
+
+When updating translations:
+
+1. Update all variants of a language together
+2. Ensure key parity across all variants
+3. Test fallback behavior after changes
+4. Consider using translation memory tools for consistency

docs/i18n-variants.md

@@ -25,6 +25,22 @@ var (
 	initOnce   sync.Once
 )
 
+// defaultLanguageVariants maps language codes without regions to their default regional variants.
+// This is used when a language without a base file is requested.
+var defaultLanguageVariants = map[string]string{
+	"pt": "pt-BR", // Portuguese defaults to Brazilian Portuguese for backward compatibility
+	// Note: We currently have base files for these languages, but if we add regional variants
+	// in the future, these defaults will be used:
+	// "de": "de-DE", // German would default to Germany German
+	// "en": "en-US", // English would default to US English
+	// "es": "es-ES", // Spanish would default to Spain Spanish
+	// "fa": "fa-IR", // Persian would default to Iran Persian
+	// "fr": "fr-FR", // French would default to France French
+	// "it": "it-IT", // Italian would default to Italy Italian
+	// "ja": "ja-JP", // Japanese would default to Japan Japanese
+	// "zh": "zh-CN", // Chinese would default to Simplified Chinese
+}
+
 // Init initializes the i18n bundle and localizer. It loads the specified locale
 // and falls back to English if loading fails.
 // Translation files are searched in the user config directory and downloaded
@@ -35,26 +51,30 @@ var (
 func Init(locale string) (*i18n.Localizer, error) {
 	// Use preferred locale detection if no explicit locale provided
 	locale = getPreferredLocale(locale)
+	// Normalize the locale to BCP 47 format (with hyphens)
+	locale = normalizeToBCP47(locale)
 	if locale == "" {
 		locale = "en"
 	}
 
 	bundle := i18n.NewBundle(language.English)
 	bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
 
-	// load embedded translations for the requested locale if available
+	// Build a list of locale candidates to try
+	locales := getLocaleCandidates(locale)
+
+	// Try to load embedded translations for each candidate
 	embedded := false
-	if data, err := localeFS.ReadFile("locales/" + locale + ".json"); err == nil {
-		_, _ = bundle.ParseMessageFileBytes(data, locale+".json")
-		embedded = true
-	} else if strings.Contains(locale, "-") {
-		// Try base language if regional variant not found (e.g., es-ES -> es)
-		baseLang := strings.Split(locale, "-")[0]
-		if data, err := localeFS.ReadFile("locales/" + baseLang + ".json"); err == nil {
-			_, _ = bundle.ParseMessageFileBytes(data, baseLang+".json")
+	for _, candidate := range locales {
+		if data, err := localeFS.ReadFile("locales/" + candidate + ".json"); err == nil {
+			_, _ = bundle.ParseMessageFileBytes(data, candidate+".json")
 			embedded = true
+			locale = candidate // Update locale to what was actually loaded
+			break
 		}
 	}
+
+	// Fall back to English if nothing was loaded
 	if !embedded {
 		if data, err := localeFS.ReadFile("locales/en.json"); err == nil {
 			_, _ = bundle.ParseMessageFileBytes(data, "en.json")
@@ -158,3 +178,63 @@ func tryGetMessage(locale, messageID string) string {
 	}
 	return ""
 }
+
+// normalizeToBCP47 normalizes a locale string to BCP 47 format.
+// Converts underscores to hyphens and ensures proper casing (language-REGION).
+func normalizeToBCP47(locale string) string {
+	if locale == "" {
+		return ""
+	}
+
+	// Replace underscores with hyphens
+	locale = strings.ReplaceAll(locale, "_", "-")
+
+	// Split into parts
+	parts := strings.Split(locale, "-")
+	if len(parts) == 1 {
+		// Language only, lowercase it
+		return strings.ToLower(parts[0])
+	} else if len(parts) >= 2 {
+		// Language and region (and possibly more)
+		// Lowercase language, uppercase region
+		parts[0] = strings.ToLower(parts[0])
+		parts[1] = strings.ToUpper(parts[1])
+		return strings.Join(parts[:2], "-") // Return only language-REGION
+	}
+
+	return locale
+}
+
+// getLocaleCandidates returns a list of locale candidates to try, in order of preference.
+// For example, for "pt-PT" it returns ["pt-PT", "pt", "pt-BR"] (where pt-BR is the default for pt).
+func getLocaleCandidates(locale string) []string {
+	candidates := []string{}
+
+	if locale == "" {
+		return candidates
+	}
+
+	// First candidate is always the requested locale
+	candidates = append(candidates, locale)
+
+	// If it's a regional variant, add the base language as a candidate
+	if strings.Contains(locale, "-") {
+		baseLang := strings.Split(locale, "-")[0]
+		candidates = append(candidates, baseLang)
+
+		// Also check if the base language has a default variant
+		if defaultVariant, exists := defaultLanguageVariants[baseLang]; exists {
+			// Only add if it's different from what we already have
+			if defaultVariant != locale {
+				candidates = append(candidates, defaultVariant)
+			}
+		}
+	} else {
+		// If this is a base language without a region, check for default variant
+		if defaultVariant, exists := defaultLanguageVariants[locale]; exists {
+			candidates = append(candidates, defaultVariant)
+		}
+	}
+
+	return candidates
+}