Merge pull request #3 from dhwani-ris/develop

Develop

Author: dhwani-ankit

.pre-commit-hooks.yaml

@@ -7,15 +7,6 @@
   files: \.py$
   pass_filenames: true
 
-- id: frappe-translation-check
-  name: Frappe Translation Wrappers Check
-  description: Check if user-facing strings are wrapped in translation functions
-  entry: frappe-pre-commit-translations
-  language: python
-  additional_dependencies: [frappe-pre-commit]
-  files: \.(py|js)$
-  pass_filenames: true
-
 - id: frappe-sql-security
   name: Frappe SQL Security Check
   description: Check for SQL injection vulnerabilities and security issues

DEVELOPER.md

@@ -19,7 +19,6 @@ pip install build twine
 ```bash
 # Test the console scripts
 frappe-pre-commit-coding-standards --help
-frappe-pre-commit-translations --help
 frappe-pre-commit-sql-security --help
 frappe-pre-commit-doctype-naming --help
 
@@ -186,9 +185,6 @@ Follow [Semantic Versioning](https://semver.org/):
 # Test coding standards
 python scripts/check_coding_standards.py scripts/check_coding_standards.py
 
-# Test translations
-python scripts/check_translations.py scripts/check_translations.py
-
 # Test SQL security
 python scripts/check_sql_security.py scripts/check_sql_security.py
 

README.md

@@ -9,7 +9,6 @@
 ## ✨ Features
 
 - 🛡️ **SQL Injection Prevention** - Detect and prevent SQL injection vulnerabilities
-- 🌐 **Translation Validation** - Ensure all user-facing strings are properly wrapped for internationalization
 - 📏 **Coding Standards** - Enforce Frappe-specific coding conventions and best practices
 - 📝 **DocType Naming** - Validate DocType and field naming conventions
 - ⚡ **Fast Execution** - Lightweight checks with minimal dependencies
@@ -76,7 +75,6 @@ pre-commit run --all-files
 | Hook ID | Description | Files | Dependencies |
 |---------|-------------|-------|--------------|
 | `frappe-coding-standards` | General coding standards and best practices | `*.py` | None |
-| `frappe-translation-check` | Translation wrapper validation | `*.py`, `*.js` | None |
 | `frappe-sql-security` | SQL injection and security checks | `*.py` | None |
 | `frappe-doctype-naming` | DocType and field naming conventions | `*.py`, `*.js`, `*.json` | `pyyaml` |
 
@@ -204,27 +202,6 @@ frappe.db.sql("SELECT * FROM tabUser WHERE name = %s", user_name)
 frappe.db.set_value("User", user, "password", frappe.utils.password.encrypt(plain_password))
 ```
 
-### 🌐 Translation Checks
-
-**Ensures all user-facing strings are wrapped:**
-
-```python
-# ❌ Will be flagged
-frappe.msgprint("Document saved successfully")
-frappe.throw("Invalid email address")
-
-# ✅ Correct approach
-frappe.msgprint(_("Document saved successfully"))
-frappe.throw(_("Invalid email address"))
-```
-
-```javascript
-// ❌ Will be flagged
-frappe.msgprint("Document saved successfully");
-
-// ✅ Correct approach
-frappe.msgprint(__("Document saved successfully"));
-```
 
 ### 📏 Coding Standards
 

examples/.pre-commit-config.yaml

@@ -77,8 +77,6 @@ repos:
   - repo: https://github.com/dhwani-ris/frappe-pre-commit
     rev: v1.0.1 
     hooks:
-      - id: frappe-translation-check
-        exclude: hooks\.py$
       - id: frappe-sql-security
       - id: frappe-doctype-naming
       - id: frappe-coding-standards

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frappe-pre-commit"
-version = "1.0.0"
+version = "1.0.1"
 description = "Pre-commit hooks for Frappe Framework coding standards"
 readme = "README.md"
 license = "MIT"

scripts/check_doctype_naming.py

@@ -145,10 +145,54 @@ def _is_valid_field_label(label):
 	if not label:
 		return False
 
-	# Should be Title Case
-	# Examples: "Customer Name", "Item Code", "Posting Date"
+	# Should be Title Case, but allow for:
+	# - Numbers (e.g., "Address 1", "Address 2")
+	# - Special characters like "&", "%", "(", ")", "-" (e.g., "A & B", "Discount %", "Price (USD)")
+	# - Common prepositions like "of", "in", "at", "to", "for", "with", "by" (e.g., "Area of Address")
+	# - Abbreviations and acronyms
+	
 	words = label.split()
-	return all(word[0].isupper() if word else False for word in words)
+	if not words:
+		return False
+	
+	# Common prepositions that can be lowercase
+	prepositions = {'of', 'in', 'at', 'to', 'for', 'with', 'by', 'from', 'on', 'up', 'down', 'out', 'off', 'over', 'under'}
+	
+	for i, word in enumerate(words):
+		if not word:
+			continue
+		
+		# Skip validation for numbers
+		if word.isdigit():
+			continue
+		
+		# Skip validation for standalone special characters like "&", "%", "-", etc.
+		if word in ['&', '-', '/', '\\', '%', '+', '=']:
+			continue
+		
+		# Handle words with parentheses like "(USD)", "(Active)", etc.
+		if word.startswith('(') and word.endswith(')'):
+			# Check if the content inside parentheses is valid (all caps or mixed case)
+			content = word[1:-1]  # Remove parentheses
+			if content.isupper() or content.isalpha():
+				continue
+		
+		# Check for invalid patterns
+		if '_' in word:  # No underscores allowed
+			return False
+		
+		if word.isupper() and len(word) > 1:  # No all caps words (except single letters)
+			return False
+		
+		# Allow lowercase for prepositions (except at the beginning)
+		if i > 0 and word.lower() in prepositions:
+			continue
+		
+		# For all other words, first character should be uppercase
+		if not word[0].isupper():
+			return False
+	
+	return True
 
 
 def main():